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

	TARGET_IMG_BASE_LDOPT rather than hardcoding -Wl,-Ttext.

diff --git a/ChangeLog b/ChangeLog
index 391e62658e5194df26ced348277271ef128f392e..bfc821c10ca38f1ecd8256742c93a5a9a5da0807 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/Makefile.core.def (lzma_decompress): Use
+       TARGET_IMG_BASE_LDOPT rather than hardcoding -Wl,-Ttext.
+
 2012-02-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/genmod.sh.in: Rewrite the Apple part.

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