* grub-core/Makefile.am: Use correct TARGET_OBJCONV rather than

	OBJCONV.

diff --git a/ChangeLog b/ChangeLog
index 16cf7cee85f5de06b72a893b6a3ba8d658884fdb..c0d1572a9c740dce8eff19ad0f82f84dfa5d74c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-24  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/Makefile.am: Use correct TARGET_OBJCONV rather than
+       OBJCONV.
+
 2013-11-24  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * 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 151b9339a5b8207b09d7adc42a700fc60bedb1b8..e2da083f2579bef3cf74f8fc5be48415a349f8bd 100644 (file)
--- 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; \