diff options
| -rw-r--r-- | config/x86_32.mk | 2 | ||||
| -rw-r--r-- | config/x86_64.mk | 2 | ||||
| -rw-r--r-- | tools/Rules.mk | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/config/x86_32.mk b/config/x86_32.mk index 1f5cd6097d..df52bd6d3e 100644 --- a/config/x86_32.mk +++ b/config/x86_32.mk @@ -5,7 +5,7 @@ CONFIG_X86_$(XEN_OS) := y CONFIG_HVM := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y -CONFIG_IOEMU := y +CONFIG_IOEMU ?= y CFLAGS += -m32 -march=i686 diff --git a/config/x86_64.mk b/config/x86_64.mk index 7bead5c455..4ec6cc196b 100644 --- a/config/x86_64.mk +++ b/config/x86_64.mk @@ -6,7 +6,7 @@ CONFIG_COMPAT := y CONFIG_HVM := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y -CONFIG_IOEMU := y +CONFIG_IOEMU ?= y CFLAGS += -m64 diff --git a/tools/Rules.mk b/tools/Rules.mk index 2dd8ed3913..f4e84c1b77 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -40,9 +40,9 @@ LDLIBS_libxenvchan = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) -L$(XEN_LIBVCHAN) SHLIB_libxenvchan = -Wl,-rpath-link=$(XEN_LIBVCHAN) ifeq ($(CONFIG_Linux),y) -LIBXL_BLKTAP = y +LIBXL_BLKTAP ?= y else -LIBXL_BLKTAP = n +LIBXL_BLKTAP ?= n endif ifeq ($(LIBXL_BLKTAP),y) |