bitkeeper revision 1.1159.223.45 (41f8f049ZJjSGVQ7S0Y7kGBwMIZfZQ)

No longer override target arch with ARCH but instead use TARGET_ARCH.
Xen now requires specification of TARGET_ARCH alone, not TARGET_ARCH
and TARGET_SUBARCH. Xen derives correct internal ARCH/SUBARCH components
automatically.

Makefile

@@ -22,9 +22,9 @@ XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%,$(wildc
 export DESTDIR
 
 # Export target architecture overrides to Xen and Linux sub-trees.
-ifneq ($(ARCH),)
-export TARGET_SUBARCH := $(ARCH)
-export SUBARCH        := $(subst x86_32,i386,$(ARCH))
+ifneq ($(TARGET_ARCH),)
+SUBARCH := $(subst x86_32,i386,$(ARCH))
+export TARGET_ARCH SUBARCH
 endif
 
 include buildconfigs/Rules.mk
@@ -42,8 +42,8 @@ install: xen checked-tools kernels docs
 
 # Only check for install req'mts on 'make install', not on 'make dist'.
 checked-tools:
-	$(MAKE) ARCH=$(ARCH) -C tools/check install
-	$(MAKE) ARCH=$(ARCH) -C tools install
+	$(MAKE) -C tools/check install
+	$(MAKE) -C tools install
 
 # build and install everything into local dist directory
 dist: xen tools kernels docs
@@ -57,7 +57,7 @@ xen:
 	$(MAKE) -C xen install
 
 tools:
-	$(MAKE) ARCH=$(ARCH) -C tools install
+	$(MAKE) -C tools install
 
 kernels:
 	for i in $(XKERNELS) ; do $(MAKE) $$i-build || exit 1; done
@@ -92,7 +92,7 @@ world:
 # clean doesn't do a kclean
 clean: 
 	$(MAKE) -C xen clean
-	$(MAKE) ARCH=$(ARCH) -C tools clean
+	$(MAKE) -C tools clean
 	$(MAKE) -C docs clean
 
 # clean, but blow away kernel build tree plus tar balls