Trivial patch to fix x86_64 builds in which XEN_TARGET_ARCH

is specified on the make command line, e.g.:
     make XEN_TARGET_ARCH=x86_64

This busted the vmxassist and hvmloader builds, which must
be done -m32.  Using "override" in the vmxassist/hvmloader
Makefiles fixes the problem by not allowing this to be
overridden from the command line.

Signed-off-by: Dave Lively <dlively@virtualiron.com>

diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
index c38832fbc5993e5940939e97ff52b2cefb4abdda..7d76d8002d04aa90d86bb0dfc5d6086d4228258a 100644 (file)
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -21,7 +21,7 @@
 # External CFLAGS can do more harm than good.
 CFLAGS :=
 
-XEN_TARGET_ARCH = x86_32
+override XEN_TARGET_ARCH = x86_32
 XEN_ROOT = ../../..
 include $(XEN_ROOT)/Config.mk
 

diff --git a/tools/firmware/vmxassist/Makefile b/tools/firmware/vmxassist/Makefile
index d34d10737382724cf3a251f109d5011ea2efa076..08fea457817a5e5d5750943cc4e1f91db652e53c 100644 (file)
--- a/tools/firmware/vmxassist/Makefile
+++ b/tools/firmware/vmxassist/Makefile
@@ -21,7 +21,7 @@
 # External CFLAGS can do more harm than good.
 CFLAGS :=
 
-XEN_TARGET_ARCH = x86_32
+override XEN_TARGET_ARCH = x86_32
 XEN_ROOT = ../../..
 include $(XEN_ROOT)/Config.mk