aboutsummaryrefslogtreecommitdiffstats
path: root/tools/Rules.mk
diff options
context:
space:
mode:
authorStefano Stabellini <sstabellini@xensource.com>2010-08-11 18:02:32 +0100
committerStefano Stabellini <sstabellini@xensource.com>2010-08-11 18:02:32 +0100
commitba26a1e19798311b6b6f4add5daac46cf2d8746f (patch)
tree09faec80a07850ce4343c5416ded3f273ade720c /tools/Rules.mk
parent2fb2bf3c2883ba042aa220b80f659c0468a650ea (diff)
downloadxen-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/Rules.mk')
-rw-r--r--tools/Rules.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/Rules.mk b/tools/Rules.mk
index 7982358f6b..95323b01bf 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -18,16 +18,16 @@ XEN_BLKTAP2 = $(XEN_ROOT)/tools/blktap2
CFLAGS_include = -I$(XEN_INCLUDE)
CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_include)
-LDFLAGS_libxenctrl = -L$(XEN_LIBXC) -lxenctrl
+LDLIBS_libxenctrl = -L$(XEN_LIBXC) -lxenctrl
CFLAGS_libxenguest = -I$(XEN_LIBXC) $(CFLAGS_include)
-LDFLAGS_libxenguest = -L$(XEN_LIBXC) -lxenguest
+LDLIBS_libxenguest = -L$(XEN_LIBXC) -lxenguest
CFLAGS_libxenstore = -I$(XEN_XENSTORE) $(CFLAGS_include)
-LDFLAGS_libxenstore = -L$(XEN_XENSTORE) -lxenstore
+LDLIBS_libxenstore = -L$(XEN_XENSTORE) -lxenstore
CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include $(CFLAGS_include)
-LDFLAGS_libblktapctl = -L$(XEN_BLKTAP2)/control -lblktapctl
+LDLIBS_libblktapctl = -L$(XEN_BLKTAP2)/control -lblktapctl
X11_LDPATH = -L/usr/X11R6/$(LIBLEAFDIR)