diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2011-03-17 19:15:42 +0000 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2011-03-17 19:15:42 +0000 |
| commit | 0394b57cda6f09f2d45feaf5a4f9dc62d6798c23 (patch) | |
| tree | e15ead99f6e888cc87aa0555a1e18a240f36f270 | |
| parent | 10128bdb23b42d84545c29c5e6864463183fd9b4 (diff) | |
| download | xen-0394b57cda6f09f2d45feaf5a4f9dc62d6798c23.tar.gz xen-0394b57cda6f09f2d45feaf5a4f9dc62d6798c23.tar.bz2 xen-0394b57cda6f09f2d45feaf5a4f9dc62d6798c23.zip | |
tools: support building with --as-needed
Tested by forcing --as-needed via tools/Rules.mk but this is included
since the intention is simply to support diustros which default to
--as-needed, not to enable it everywhere.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
| -rw-r--r-- | tools/Rules.mk | 3 | ||||
| -rw-r--r-- | tools/blktap2/vhd/lib/Makefile | 2 | ||||
| -rw-r--r-- | tools/libxc/Makefile | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/tools/Rules.mk b/tools/Rules.mk index 6249573c5b..e740799e58 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -65,9 +65,6 @@ CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE LDFLAGS += $(shell getconf LFS_LDFLAGS) endif -# Xen tools build is currently incompatible with ld --as-needed -LDFLAGS += -Wl,--no-as-needed - # 32-bit x86 does not perform well with -ve segment accesses on Xen. CFLAGS-$(CONFIG_X86_32) += $(call cc-option,$(CC),-mno-tls-direct-seg-refs) CFLAGS += $(CFLAGS-y) diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile index 5854900794..fdfaeedbb4 100644 --- a/tools/blktap2/vhd/lib/Makefile +++ b/tools/blktap2/vhd/lib/Makefile @@ -57,7 +57,7 @@ build: $(LIBVHD-BUILD) libvhd.a: $(LIB-OBJS) $(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG),$(LIBVHD-SONAME) $(SHLIB_LDFLAGS) \ - $(LDFLAGS) -o libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $(LIBS) $^ + $(LDFLAGS) -o libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $^ $(LIBS) ln -sf libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) libvhd.so.$(LIBVHD-MAJOR) ln -sf libvhd.so.$(LIBVHD-MAJOR) libvhd.so $(AR) rc $@ $^ diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 9942c3ab11..e75500145d 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -159,7 +159,7 @@ libxenctrl.so.$(MAJOR): libxenctrl.so.$(MAJOR).$(MINOR) ln -sf $< $@ libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(DLOPEN_LIBS) $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(DLOPEN_LIBS) $(PTHREAD_LIBS) # libxenguest |