Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh64-2.6

[karo-tx-linux.git] / Documentation / lguest / Makefile

diff --git a/Documentation/lguest/Makefile b/Documentation/lguest/Makefile
index b9b9427376e9047c6e21b2933167e3a2fd943aba..c0b7a4556390e7c15e3f088ab1368c5db3cb9cca 100644 (file)
--- a/Documentation/lguest/Makefile
+++ b/Documentation/lguest/Makefile
@@ -11,10 +11,11 @@ endif
 include $(KBUILD_OUTPUT)/.config
 LGUEST_GUEST_TOP := ($(CONFIG_PAGE_OFFSET) - 0x08000000)
 
-CFLAGS:=-Wall -Wmissing-declarations -Wmissing-prototypes -O3 \
-       -static -DLGUEST_GUEST_TOP="$(LGUEST_GUEST_TOP)" -Wl,-T,lguest.lds
+CFLAGS:=-Wall -Wmissing-declarations -Wmissing-prototypes -O3 -Wl,-T,lguest.lds
 LDLIBS:=-lz
-
+# Removing this works for some versions of ld.so (eg. Ubuntu Feisty) and
+# not others (eg. FC7).
+LDFLAGS+=-static
 all: lguest.lds lguest
 
 # The linker script on x86 is so complex the only way of creating one