diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2011-11-23 11:15:31 +0000 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2011-11-23 11:15:31 +0000 |
| commit | 5aca159d276987ed884179742a4ca9b42c553af8 (patch) | |
| tree | 01cb7db507e65ed5c8eb2b5da2e61543a77b9481 /tools/blktap | |
| parent | 1d3cf6bdf14f5fbb05b6ab160066f9469b196afe (diff) | |
| download | xen-5aca159d276987ed884179742a4ca9b42c553af8.tar.gz xen-5aca159d276987ed884179742a4ca9b42c553af8.tar.bz2 xen-5aca159d276987ed884179742a4ca9b42c553af8.zip | |
tools: use system libaio for blktap1 as well.
24184:4ecd3615e726 missed this because I was accidentally testing with a
.config containing CONFIG_SYSTEM_LIBAIO=n. Tools tree now fully rebuilt
without this. There were no other issues.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/blktap')
| -rw-r--r-- | tools/blktap/drivers/Makefile | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile index 2b91a2c71b..aa9f280af7 100644 --- a/tools/blktap/drivers/Makefile +++ b/tools/blktap/drivers/Makefile @@ -3,7 +3,6 @@ include $(XEN_ROOT)/tools/Rules.mk IBIN = blktapctrl tapdisk QCOW_UTIL = img2qcow qcow2raw qcow-create -LIBAIO_DIR = ../../libaio/src MEMSHR_DIR = ../../memshr CFLAGS += -Werror @@ -11,7 +10,6 @@ CFLAGS += -Wno-unused CFLAGS += -I../lib CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += $(CFLAGS_libxenstore) -CFLAGS += -I $(LIBAIO_DIR) CFLAGS += -I $(MEMSHR_DIR) CFLAGS += -D_GNU_SOURCE @@ -29,8 +27,16 @@ CFLAGS += -DMEMSHR MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a endif +ifneq ($(CONFIG_SYSTEM_LIBAIO),y) +LIBAIO_DIR = ../../libaio/src +CFLAGS += -I $(LIBAIO_DIR) +AIOLIBS := $(LIBAIO_DIR)/libaio.a +else +AIOLIBS := -laio +endif + LDLIBS_blktapctrl := $(MEMSHRLIBS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) -L../lib -lblktap -lrt -lm -lpthread -LDLIBS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz +LDLIBS_img := $(AIOLIBS) $(CRYPT_LIB) -lpthread -lz BLK-OBJS-y := block-aio.o BLK-OBJS-y += block-sync.o |