aboutsummaryrefslogtreecommitdiffstats
path: root/tools/xentrace
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/xentrace
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/xentrace')
-rw-r--r--tools/xentrace/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index fec7dba619..25dda4984a 100644
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk
CFLAGS += -Werror
CFLAGS += $(CFLAGS_libxenctrl)
-LDFLAGS += $(LDFLAGS_libxenctrl)
+LDLIBS += $(LDLIBS_libxenctrl)
HDRS = $(wildcard *.h)
OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
@@ -50,9 +50,9 @@ clean:
$(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN) $(DEPS)
%: %.c $(HDRS) Makefile
- $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS)
xentrace_%: %.c $(HDRS) Makefile
- $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS)
-include $(DEPS)