Merge lp:~michaelh1/crosstool-ng/src-and-pi into lp:~linaro-toolchain-dev/crosstool-ng/linaro

[Michael Hope]

Change the name of _src. Extend the win32 headers fixup to Raspbian. TARGET and HOST come from TARGETS and HOSTS.

[Michael Hope (michaelh1)]

cbuild has taken a snapshot of this branch at r2478 and queued it for build.

The diff against the ancestor r2475 is available at:
 http://builds.linaro.org/toolchain/snapshots/crosstool-ng-linaro-1.13.1+bzr2478~michaelh1~src-and-pi.diff

and will be built on the following builders:
 i686-lucid

You can track the build queue at:
 http://ex.seabright.co.nz/helpers/scheduler

cbuild-snapshot: crosstool-ng-linaro-1.13.1+bzr2478~michaelh1~src-and-pi
cbuild-ancestor: lp:~linaro-toolchain-dev/crosstool-ng/linaro+bzr2475
cbuild-state: check

=== modified file 'contrib/linaro/build.mk'
--- contrib/linaro/build.mk	2012-09-25 03:32:25 +0000
+++ contrib/linaro/build.mk	2012-09-26 03:32:21 +0000
@@ -7,10 +7,13 @@
 
 # Top level product
 PRODUCT ?= gcc-linaro
-# Target this build compiles for
-TARGET ?= arm-linux-gnueabihf
-# Host OS the toolchain will run on
-HOST ?= linux
+# Targets to build.  See samples/linaro-%.  As at 2012-09 these
+# include arm-linux-gnueabihf, arm-none-eabi, and
+# arm-linux-gnueabihf-raspbian.
+TARGETS = arm-linux-gnueabihf
+# The variants to build including Linux hosted, Windows hosted, and
+# just the device runtime
+HOSTS = linux win32 runtime
 # Major version of the toolchain.  Pulled automatically from the
 # .config file
 VERSION = $(shell awk 'BEGIN {FS="[=\"-]"}; /^CT_CC_VERSION/ {print $$5}' \
@@ -22,19 +25,18 @@
 
 # Full name of this release.  Used in the tarball name
 FULL = $(PRODUCT)-$(TARGET)-$(VERSION)-$(SPIN)$(REVISION)
+# Full name of the source tarball
+SRC = $(PRODUCT)-$(VERSION)-$(SPIN)$(REVISION)_src
+
 # Tarball/directory name
 DIRNAME = $(FULL)_$(HOST)
 
-# Targets to build.  See samples/linaro-%.  As at 2012-09 these
-# include arm-linux-gnueabihf, arm-none-eabi, and
-# arm-linux-gnueabihf-raspbian.
-TARGETS = arm-linux-gnueabihf
-# The variants to build including Linux hosted, Windows hosted, and
-# just the device runtime
-HOSTS = linux win32 runtime
-
 -include local.mk
 
+# Target this build compiles for
+TARGET ?= $(firstword $(TARGETS))
+# Host OS the toolchain will run on
+HOST ?= $(firstword $(TARGETS))
 # Pull the triplet out of the target
 TRIPLET = $(subst -raspbian,,$(TARGET))
 
@@ -156,11 +158,11 @@
 
 # Build a tarball of everything that went into the build
 $(stamp)src: $(ALL_TARGETS)
-	rm -rf $(BUILD)/src/$(FULL)_src
-	mkdir -p $(BUILD)/src/$(FULL)_src
-	cp -afu tarballs/* $(BUILD)/src/$(FULL)_src
-	cd $(BUILD)/src/$(FULL)_src && md5sum * > md5sum
-	cd $(BUILD)/src && tar cjf $(FULL)_src.tar.bz2 $(FULL)_src
+	rm -rf $(BUILD)/src
+	mkdir -p $(BUILD)/src/$(SRC)
+	cp -afu tarballs/* $(BUILD)/src/$(SRC)
+	cd $(BUILD)/src/$(SRC) && md5sum * > md5sum
+	cd $(BUILD)/src && tar cjf $(SRC).tar.bz2 $(SRC)
 	touch $@
 
 # Stage 2: target and host specific
@@ -253,7 +255,7 @@
 
 # Host or target specific fixups
 
-$(dstamp)arm-linux-gnueabihf-win32-fixup: $(dstamp)common-fixup
+$(dstamp)arm-linux-%-win32-fixup: $(dstamp)common-fixup
 	# Rename the netfilter header files
 	for i in $(NETFILTER_RENAMES); do \
 		mv $(LINUX_INC)/$${i}.h $(LINUX_INC)/$${i}_.h; \