[Xen-devel] Re: [PATCH] LDFLAGS in link lines

[Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>]

iwj writes ("[PATCH] LDFLAGS in link lines"):
> LDFLAGS is not honoured by a couple of link lines in tools/*, but
> should be.

Here is some more of the same in a few other Makefiles.  This is part
of tools-rpath.diff in the Debian package.

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/xentrace/Makefile
+++ xen-unstable/tools/xentrace/Makefile
@@ -52,6 +52,6 @@
        $(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN)
 
 %: %.c $(HDRS) Makefile
-       $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
+       $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) $(LDFLAGS) -lxenctrl
 xentrace_%: %.c $(HDRS) Makefile
-       $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
+       $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) $(LDFLAGS) -lxenctrl
--- xen-unstable.orig/tools/blktap/drivers/Makefile
+++ xen-unstable/tools/blktap/drivers/Makefile
@@ -49,7 +49,7 @@
 qcow-util: img2qcow qcow2raw qcow-create
 
 img2qcow qcow2raw qcow-create: %: $(BLK-OBJS)
-       $(CC) $(CFLAGS) -o $* $(BLK-OBJS) $*.c $(AIOLIBS) $(LIBS)
+       $(CC) $(CFLAGS) -o $* $(BLK-OBJS) $*.c $(LDFLAGS) $(AIOLIBS) $(LIBS)
 
 install: all
        $(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(INST_DIR)
--- xen-unstable.orig/tools/blktap/lib/Makefile
+++ xen-unstable/tools/blktap/lib/Makefile
@@ -52,7 +52,7 @@
 
 libblktap.a: $(OBJS) 
        $(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_CFLAGS) \
-             -L$(XEN_XENSTORE) -l xenstore                                \
+             -L$(XEN_XENSTORE) $(LDFLAGS) -l xenstore                          
      \
              -o libblktap.so.$(MAJOR).$(MINOR) $^ $(LIBS)
        ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR)
        ln -sf libblktap.so.$(MAJOR) libblktap.so

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel