diff options
| author | Stefano Stabellini <sstabellini@xensource.com> | 2010-08-11 18:02:32 +0100 |
|---|---|---|
| committer | Stefano Stabellini <sstabellini@xensource.com> | 2010-08-11 18:02:32 +0100 |
| commit | ba26a1e19798311b6b6f4add5daac46cf2d8746f (patch) | |
| tree | 09faec80a07850ce4343c5416ded3f273ade720c /tools/blktap2/vhd | |
| parent | 2fb2bf3c2883ba042aa220b80f659c0468a650ea (diff) | |
| download | xen-ba26a1e19798311b6b6f4add5daac46cf2d8746f.tar.gz xen-ba26a1e19798311b6b6f4add5daac46cf2d8746f.tar.bz2 xen-ba26a1e19798311b6b6f4add5daac46cf2d8746f.zip | |
split LDLIBS from LDFLAGS to fix link errors in recent toolchains
Linker command lines are order-sensitive.
Move linker options -Lfoo -lfoo from LDFLAGS to LDLIBS and place this new
variable after the objects to link. This resolves build errors in xenpagin
and blktap with recent toolchains.
rename SHLIB_CFLAGS to SHLIB_LDFLAGS
rename LDFLAGS_* to LDLIBS_*
move LDFLAGS usage after CFLAGS in CC calls
remove stale comments in xenpaging Makefile
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/blktap2/vhd')
| -rw-r--r-- | tools/blktap2/vhd/Makefile | 4 | ||||
| -rw-r--r-- | tools/blktap2/vhd/lib/Makefile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/blktap2/vhd/Makefile b/tools/blktap2/vhd/Makefile index 48a6e540b1..f356f5ec6f 100644 --- a/tools/blktap2/vhd/Makefile +++ b/tools/blktap2/vhd/Makefile @@ -38,10 +38,10 @@ LIBS_DEPENDS := lib/libvhd.so lib/vhd.a $(LIBS_DEPENDS):subdirs-all vhd-util: vhd-util.o $(LIBS_DEPENDS) - $(CC) $(CFLAGS) -o vhd-util vhd-util.o $(LDFLAGS) $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o vhd-util vhd-util.o $(LIBS) vhd-update: vhd-update.o $(LIBS_DEPENDS) - $(CC) $(CFLAGS) -o vhd-update vhd-update.o $(LDFLAGS) $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o vhd-update vhd-update.o $(LIBS) install: all $(MAKE) subdirs-install diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile index fa5b417619..12e7510d4b 100644 --- a/tools/blktap2/vhd/lib/Makefile +++ b/tools/blktap2/vhd/lib/Makefile @@ -55,7 +55,7 @@ all: build build: $(LIBVHD-BUILD) libvhd.a: $(LIB-OBJS) - $(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG),$(LIBVHD-SONAME) $(SHLIB_CFLAGS) \ + $(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG),$(LIBVHD-SONAME) $(SHLIB_LDFLAGS) \ $(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 |