diff options
| -rw-r--r-- | tools/Makefile | 7 | ||||
| -rw-r--r-- | tools/Rules.mk | 2 | ||||
| -rw-r--r-- | tools/firmware/Rules.mk | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/tools/Makefile b/tools/Makefile index 7b146785eb..6688d07a7d 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -122,7 +122,9 @@ subdir-all-qemu-xen-traditional-dir subdir-install-qemu-xen-traditional-dir: qem set -e; \ $(buildmakevars2shellvars); \ cd qemu-xen-traditional-dir; \ - $(QEMU_ROOT)/xen-setup $(IOEMU_CONFIGURE_CROSS); \ + $(QEMU_ROOT)/xen-setup \ + --extra-cflags="$(EXTRA_CFLAGS_QEMU_TRADITIONAL)" \ + $(IOEMU_CONFIGURE_CROSS); \ $(MAKE) install subdir-clean-qemu-xen-traditional-dir: @@ -151,7 +153,8 @@ subdir-all-qemu-xen-dir subdir-install-qemu-xen-dir: qemu-xen-dir-find --extra-cflags="-I$(XEN_ROOT)/tools/include \ -I$(XEN_ROOT)/tools/libxc \ -I$(XEN_ROOT)/tools/xenstore \ - -I$(XEN_ROOT)/tools/xenstore/compat" \ + -I$(XEN_ROOT)/tools/xenstore/compat \ + $(EXTRA_CFLAGS_QEMU_XEN)" \ --extra-ldflags="-L$(XEN_ROOT)/tools/libxc \ -L$(XEN_ROOT)/tools/xenstore" \ --bindir=$(LIBEXEC) \ diff --git a/tools/Rules.mk b/tools/Rules.mk index a2a1a5846a..1e928b7b22 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -76,6 +76,8 @@ endif CFLAGS-$(CONFIG_X86_32) += $(call cc-option,$(CC),-mno-tls-direct-seg-refs) CFLAGS += $(CFLAGS-y) +CFLAGS += $(EXTRA_CFLAGS_XEN_TOOLS) + # Require GCC v3.4+ (to avoid issues with alignment constraints in Xen headers) check-$(CONFIG_X86) = $(call cc-ver-check,CC,0x030400,\ "Xen requires at least gcc-3.4") diff --git a/tools/firmware/Rules.mk b/tools/firmware/Rules.mk index 8a8830911b..26bbddccd4 100644 --- a/tools/firmware/Rules.mk +++ b/tools/firmware/Rules.mk @@ -3,6 +3,7 @@ override XEN_TARGET_ARCH = x86_32 # User-supplied CFLAGS are not useful here. CFLAGS = +EXTRA_CFLAGS_XEN_TOOLS = include $(XEN_ROOT)/tools/Rules.mk |