LDFLAGS is not honoured by a couple of link lines in tools/*, but
should be.
(I have tested this patch by building, but I have not yet executed the
result.)
Ian.
Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
This patch is extracted directly from the Debian package prepared by
Bastian Blank. Debian's svn logs show a commit by Bastian and no
prior history, and there is a corresponding changelog entry. I
think it's safe to say that Bastian wrote the patch.
--- xen-unstable.orig/tools/blktap/drivers/Makefile
+++ xen-unstable/tools/blktap/drivers/Makefile
@@ -39,11 +39,11 @@
all: $(IBIN) qcow-util
blktapctrl: blktapctrl.c
- $(CC) $(CFLAGS) -o blktapctrl $(LIBS) blktapctrl.c
+ $(CC) $(CFLAGS) -o blktapctrl $(LDFLAGS) $(LIBS) blktapctrl.c
tapdisk: $(BLK-OBJS) tapdisk.c
$(CC) $(CFLAGS) -o tapdisk $(BLK-OBJS) tapdisk.c \
- $(AIOLIBS) $(LIBS)
+ $(AIOLIBS) $(LDFLAGS) $(LIBS)
.PHONY: qcow-util
qcow-util: img2qcow qcow2raw qcow-create
--- xen-unstable.orig/tools/console/Makefile
+++ xen-unstable/tools/console/Makefile
@@ -20,11 +20,11 @@
$(RM) client/*.o daemon/*.o
xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c))
- $(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
+ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
$(UTIL_LIBS) $(SOCKET_LIBS) -lxenctrl -lxenstore
xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c))
- $(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
+ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
$(UTIL_LIBS) $(SOCKET_LIBS) -lxenctrl -lxenstore
.PHONY: install
--- xen-unstable.orig/tools/misc/Makefile
+++ xen-unstable/tools/misc/Makefile
@@ -41,4 +41,4 @@
$(CC) -c $(CFLAGS) -o $@ $<
xenperf: %: %.o Makefile
- $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
+ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl
--- xen-unstable.orig/tools/xcutils/Makefile
+++ xen-unstable/tools/xcutils/Makefile
@@ -33,7 +33,7 @@
build: $(PROGRAMS)
$(PROGRAMS): %: %.o
- $(CC) $(CFLAGS) $^ $(LDLIBS) -o $@
+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
.PHONY: install
install: build
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home