From b700a427d2e59781310557d296f095cba512dfe9 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sun, 24 Nov 2013 05:27:20 +0100 Subject: [PATCH] * grub-core/Makefile.am: Use correct TARGET_OBJCONV rather than OBJCONV. --- ChangeLog | 5 +++++ grub-core/Makefile.am | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16cf7cee8..c0d1572a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-11-24 Vladimir Serbinenko + + * grub-core/Makefile.am: Use correct TARGET_OBJCONV rather than + OBJCONV. + 2013-11-24 Vladimir Serbinenko * grub-core/gdb/i386/machdep.S: Use xorl %eax, %eax on both Apple diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am index 151b9339a..e2da083f2 100644 --- a/grub-core/Makefile.am +++ b/grub-core/Makefile.am @@ -391,7 +391,7 @@ efiemu32.o: efiemu/runtime/efiemu.c $(TARGET_OBJ2ELF) -rm -f $@; \ if test "x$(TARGET_APPLE_LINKER)" = x1; then \ $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m32 -Wall -Werror -nostdlib -O2 -c -o $@.bin $< || exit 1; \ - $(OBJCONV) -felf32 -nu -nd $@.bin $@ || exit 1; \ + $(TARGET_OBJCONV) -felf32 -nu -nd $@.bin $@ || exit 1; \ rm -f $@.bin; \ else \ $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m32 -Wall -Werror -nostdlib -O2 -c -o $@ $< || exit 1; \ @@ -418,7 +418,7 @@ efiemu64.o: efiemu64_c.o efiemu64_s.o $(TARGET_OBJ2ELEF) if test "x$(TARGET_APPLE_LINKER)" = x1; then \ rm -f $@.bin; \ $(TARGET_CC) -m64 -Wl,-r -nostdlib -o $@.bin $^ || exit 1; \ - $(OBJCONV) -felf64 -nu -nd $@.bin $@ || exit 1; \ + $(TARGET_OBJCONV) -felf64 -nu -nd $@.bin $@ || exit 1; \ rm -f $@.bin; \ else \ $(TARGET_CC) -m64 -Wl,-melf_x86_64 -nostdlib -Wl,-r -o $@ $^ || exit 1; \