diff options
| author | Olaf Hering <olaf@aepfle.de> | 2012-03-14 17:02:23 +0100 |
|---|---|---|
| committer | Olaf Hering <olaf@aepfle.de> | 2012-03-14 17:02:23 +0100 |
| commit | 645c523d0a7654e38641266249c0c0c9d1a3fe0a (patch) | |
| tree | b3688fd34929aed6de4b944477cb972bfd08f7e4 /tools/blktap2 | |
| parent | ccd266a2e7c6bb47a7311af3bc05f54f1572429c (diff) | |
| download | xen-645c523d0a7654e38641266249c0c0c9d1a3fe0a.tar.gz xen-645c523d0a7654e38641266249c0c0c9d1a3fe0a.tar.bz2 xen-645c523d0a7654e38641266249c0c0c9d1a3fe0a.zip | |
tools/blktap: reorder MEMSHR_DIR to fix CFLAGS
In blktap2 MEMSHR_DIR is used before it is set. This removes the
required -D_GNU_SOURCE from CFLAGS, its used as option for -I
Fix this by moving memshr related flags to the place where its actually
used.
The failure is a missing O_DIRECT define.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
Diffstat (limited to 'tools/blktap2')
| -rw-r--r-- | tools/blktap2/drivers/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile index 15e1bc0df8..2f93d2d1cc 100644 --- a/tools/blktap2/drivers/Makefile +++ b/tools/blktap2/drivers/Makefile @@ -14,7 +14,6 @@ CFLAGS += -Wno-unused CFLAGS += -fno-strict-aliasing CFLAGS += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers CFLAGS += $(CFLAGS_libxenctrl) -CFLAGS += -I $(MEMSHR_DIR) CFLAGS += -D_GNU_SOURCE CFLAGS += -DUSE_NFS_LOCKS @@ -38,11 +37,11 @@ else tapdisk2 tapdisk-stream tapdisk-diff $(QCOW_UTIL): AIOLIBS := -laio endif -MEMSHR_DIR = $(XEN_ROOT)/tools/memshr - MEMSHRLIBS := ifeq ($(CONFIG_Linux), __fixme__) +MEMSHR_DIR = $(XEN_ROOT)/tools/memshr CFLAGS += -DMEMSHR +CFLAGS += -I $(MEMSHR_DIR) MEMSHRLIBS += -L$(XEN_ROOT)/tools/libxc -lxenctrl $(MEMSHR_DIR)/libmemshr.a endif |