From 3ea1ca46c1a43b69e713cc83ee872740927d1717 Mon Sep 17 00:00:00 2001 From: Seth Goldberg Date: Fri, 23 Dec 2011 11:39:30 +0100 Subject: [PATCH] * grub-core/Makefile.core.def (lzma_decompress): Add missing TARGET_IMG_LDFLAGS. --- ChangeLog | 5 +++++ grub-core/Makefile.core.def | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9236d27f8..d76f07ac4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-12-23 Seth Goldberg + + * grub-core/Makefile.core.def (lzma_decompress): Add missing + TARGET_IMG_LDFLAGS. + 2011-12-23 Vladimir Serbinenko * util/getroot.c (ESCAPED_PATH_MAX): New define. diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def index c00773446..218f3df64 100644 --- 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; };