* grub-core/Makefile.core.def (lzma_decompress): Add missing

	TARGET_IMG_LDFLAGS.

diff --git a/ChangeLog b/ChangeLog
index 9236d27f87cebd2e4a0eb4b8d0d27195a2ae06ce..d76f07ac456cb1845dd67934a68cf600c6df4135 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-23  Seth Goldberg <seth.goldberg@oracle.com>
+
+       * grub-core/Makefile.core.def (lzma_decompress): Add missing
+       TARGET_IMG_LDFLAGS.
+
 2011-12-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/getroot.c (ESCAPED_PATH_MAX): New define.

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index c00773446fb3943aaf96f302de8e9f892adb862b..218f3df641bb400b52cff6c0bf1901c351a55a09 100644 (file)
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -373,7 +373,7 @@ image = {
   i386_pc = boot/i386/pc/startup_raw.S;
 
   objcopyflags = '-O binary';
-  ldflags = '-Wl,-Ttext,0x8200';
+  ldflags = '$(TARGET_IMG_LDFLAGS) -Wl,-Ttext,0x8200';
   enable = i386_pc;
 };