diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-08-20 22:26:16 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-08-20 22:26:16 +0100 |
| commit | 4a22a4ce1e7820dee4ab4cbf573df252b972c6ad (patch) | |
| tree | 4e8a83132784de0b499a497903446c3a75108e70 /tools/libxc/Makefile | |
| parent | d7c9674faa1683c9008c9897ea6d6b1519d9af7f (diff) | |
| download | xen-4a22a4ce1e7820dee4ab4cbf573df252b972c6ad.tar.gz xen-4a22a4ce1e7820dee4ab4cbf573df252b972c6ad.tar.bz2 xen-4a22a4ce1e7820dee4ab4cbf573df252b972c6ad.zip | |
libxenguest: Fix libbz2/liblzma dependency computation.
1. Create an empty dep file if neither lib is installed
2. Forcibly disable support for libs if building minios
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'tools/libxc/Makefile')
| -rw-r--r-- | tools/libxc/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 2adf8e689d..5693025e60 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -151,10 +151,14 @@ libxenguest.so: libxenguest.so.$(MAJOR) libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR) ln -sf $< $@ +ifeq ($(CONFIG_MiniOS),y) +.zlib.deps: + echo >$@ +else .zlib.deps: @(set -e; \ . ../check/funcs.sh; \ - rm -f $@.new; \ + echo >$@.new; \ if has_header bzlib.h; then \ echo "-DHAVE_BZLIB" >>$@.new; \ echo "-lbz2" >>$@.new; \ @@ -166,6 +170,7 @@ libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR) echo " - LZMA decompression supported"; \ fi; \ mv $@.new $@) +endif xc_dom_bzimageloader.o: .zlib.deps xc_dom_bzimageloader.o: CFLAGS += $(shell grep D .zlib.deps) |