diff options
| author | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-05-23 15:22:15 +0000 |
|---|---|---|
| committer | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-05-23 15:22:15 +0000 |
| commit | dad197b071e41ba1a969fe10fc6fda20d5b46fef (patch) | |
| tree | 64e342bc4b2768908bcd4aeb993ccde6cf10512d | |
| parent | 83bd20f0d6cb766766bc9c26bd4106f7f5ac92c3 (diff) | |
| download | xen-dad197b071e41ba1a969fe10fc6fda20d5b46fef.tar.gz xen-dad197b071e41ba1a969fe10fc6fda20d5b46fef.tar.bz2 xen-dad197b071e41ba1a969fe10fc6fda20d5b46fef.zip | |
bitkeeper revision 1.1513 (4291f527HzSV5MgVTL5ZpTs61-VQvg)
mk.linux-2.6-xenU, mk.linux-2.6-xen0, Rules.mk, Config.mk:
Move {COMPILE,TARGET}_{,SUB}ARCH} definition into xen/Rules.mk.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
| -rw-r--r-- | Config.mk | 6 | ||||
| -rw-r--r-- | buildconfigs/mk.linux-2.6-xen0 | 2 | ||||
| -rw-r--r-- | buildconfigs/mk.linux-2.6-xenU | 2 | ||||
| -rw-r--r-- | xen/Rules.mk | 6 |
4 files changed, 8 insertions, 8 deletions
@@ -4,12 +4,6 @@ XEN_COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) XEN_TARGET_ARCH ?= $(XEN_COMPILE_ARCH) -# Set ARCH/SUBARCH appropriately. -override COMPILE_SUBARCH := $(XEN_COMPILE_ARCH) -override TARGET_SUBARCH := $(XEN_TARGET_ARCH) -override COMPILE_ARCH := $(patsubst x86%,x86,$(XEN_COMPILE_ARCH)) -override TARGET_ARCH := $(patsubst x86%,x86,$(XEN_TARGET_ARCH)) - # Tools to run on system hosting the build HOSTCC = gcc HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer diff --git a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0 index 099120c4d4..4a123641a8 100644 --- a/buildconfigs/mk.linux-2.6-xen0 +++ b/buildconfigs/mk.linux-2.6-xen0 @@ -33,7 +33,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \ [ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \ cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \ - || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(TARGET_SUBARCH) \ + || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \ $(LINUX_DIR)/.config $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig diff --git a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU index f686e95077..b83244efd0 100644 --- a/buildconfigs/mk.linux-2.6-xenU +++ b/buildconfigs/mk.linux-2.6-xenU @@ -33,7 +33,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \ [ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \ cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \ - || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(TARGET_SUBARCH) \ + || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \ $(LINUX_DIR)/.config $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig diff --git a/xen/Rules.mk b/xen/Rules.mk index 1db12a3d0d..221882814a 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -10,6 +10,12 @@ crash_debug ?= n include $(BASEDIR)/../Config.mk +# Set ARCH/SUBARCH appropriately. +override COMPILE_SUBARCH := $(XEN_COMPILE_ARCH) +override TARGET_SUBARCH := $(XEN_TARGET_ARCH) +override COMPILE_ARCH := $(patsubst x86%,x86,$(XEN_COMPILE_ARCH)) +override TARGET_ARCH := $(patsubst x86%,x86,$(XEN_TARGET_ARCH)) + TARGET := $(BASEDIR)/xen HDRS := $(wildcard $(BASEDIR)/include/xen/*.h) HDRS += $(wildcard $(BASEDIR)/include/public/*.h) |