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/blktap/lib | |
| 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/blktap/lib')
| -rw-r--r-- | tools/blktap/lib/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile index aedf7dcd2e..4f05e2f3c3 100644 --- a/tools/blktap/lib/Makefile +++ b/tools/blktap/lib/Makefile @@ -8,7 +8,7 @@ SONAME = libblktap.so.$(MAJOR) CFLAGS += -I. CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += $(CFLAGS_libxenstore) -LDFLAGS += $(LDFLAGS_libxenstore) +LDLIBS += $(LDLIBS_libxenstore) SRCS := SRCS += xenbus.c blkif.c xs_api.c @@ -46,8 +46,8 @@ clean: rm -rf *.a *.so* *.o *.opic *.rpm $(LIB) *~ $(DEPS) xen TAGS libblktap.so.$(MAJOR).$(MINOR): $(OBJS_PIC) - $(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_CFLAGS) \ - $(LDFLAGS) -o $@ $^ + $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_LDFLAGS) \ + -o $@ $^ $(LDLIBS) ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR) ln -sf libblktap.so.$(MAJOR) libblktap.so |