diff --git a/[refs] b/[refs] index dbaa987f0a4d..55f838c0ce3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d027c01cd36b8cff727c78d2e40d334ba9895a8 +refs/heads/master: e3bcf5e2785aa49f75f36a8d27d601891a7ff12b diff --git a/trunk/Documentation/lguest/Makefile b/trunk/Documentation/lguest/Makefile index 31e794ef5f98..c0b7a4556390 100644 --- a/trunk/Documentation/lguest/Makefile +++ b/trunk/Documentation/lguest/Makefile @@ -13,7 +13,9 @@ LGUEST_GUEST_TOP := ($(CONFIG_PAGE_OFFSET) - 0x08000000) 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