mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
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>
This commit is contained in:
cl349@firebug.cl.cam.ac.uk committed
1 parent
83bd20f0d6
commit
dad197b071
4 files changed
+8
-8
No files matched your search
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||