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/flask | |
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/flask')
-rw-r--r-- | tools/flask/libflask/Makefile | 2 | ||||
-rw-r--r-- | tools/flask/utils/Makefile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/flask/libflask/Makefile b/tools/flask/libflask/Makefile index 7f33f124df..0af2f06213 100644 --- a/tools/flask/libflask/Makefile +++ b/tools/flask/libflask/Makefile @@ -59,6 +59,6 @@ libflask.so.$(MAJOR): libflask.so.$(MAJOR).$(MINOR) ln -sf $< $@ libflask.so.$(MAJOR).$(MINOR): $(PIC_OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libflask.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^ + $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libflask.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ -include $(DEPS) diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile index 0908f51443..c7110a45bf 100644 --- a/tools/flask/utils/Makefile +++ b/tools/flask/utils/Makefile @@ -14,7 +14,7 @@ BASECFLAGS+= -I$(LIBFLASK_ROOT)/include BASECFLAGS+= -I. CFLAGS += $(BASECFLAGS) -LDFLAGS += $(PROFILE) -L$(XEN_LIBXC) -L$(LIBFLASK_ROOT) +LDLIBS += $(PROFILE) -L$(XEN_LIBXC) -L$(LIBFLASK_ROOT) TESTDIR = testsuite/tmp TESTFLAGS= -DTESTING TESTENV = XENSTORED_ROOTDIR=$(TESTDIR) XENSTORED_RUNDIR=$(TESTDIR) @@ -27,7 +27,7 @@ CLIENTS_OBJS := $(patsubst flask-%,%.o,$(CLIENTS)) all: $(CLIENTS) $(CLIENTS): flask-%: %.o - $(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lflask $(LDFLAGS_libxenctrl) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lflask $(LDLIBS_libxenctrl) -o $@ .PHONY: clean clean: |