[Xen-changelog] [xen master] tools/libxc: Fix use of zlib-options when building the domain builder

[patchbot@xxxxxxx]

commit 99ba14f3cff29eeb59809f92a6ca3a8705133c75
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Fri Feb 12 19:21:31 2016 +0000
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Mon Feb 15 17:05:55 2016 +0000

    tools/libxc: Fix use of zlib-options when building the domain builder

    c/s de0f8c7c changed the use of zlib-options, and moved it from being 
locally
    generated to coming from ./configure.

    However, it neglected to modify the users of zlib-options.  The curious use 
of
    $(call ...) was to select either the -D or -l options as appropriate, but 
c/s
    de0f8c7c broke this by loosing the `grep`.

    Instead, use $(filter ...) to pick out either the -D or -l options.  This
    fixes the build with Clang, which complains at passing '-llzma' when trying
    to compile xc_dom_bzimageloader.c to xc_dom_bzimageloader.o.

    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Acked-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
 tools/libxc/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 0a8614c..608404f 100644
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -226,10 +226,10 @@ else
 zlib-options = $(ZLIB)
 endif

-xc_dom_bzimageloader.o: CFLAGS += $(call zlib-options,D)
-xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D)
+xc_dom_bzimageloader.o: CFLAGS += $(filter -D%,$(zlib-options))
+xc_dom_bzimageloader.opic: CFLAGS += $(filter -D%,$(zlib-options))

-libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(call zlib-options,l)
+libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(filter 
-l%,$(zlib-options))
 libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
        $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) 
$(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz 
$(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(PTHREAD_LIBS) $(APPEND_LDFLAGS)

--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog