Merge lp:~michaelh1/crosstool-ng/lp988574 into lp:~linaro-toolchain-dev/crosstool-ng/linaro

[Michael Hope]

linaro/build: de-duplicate gcc, c++, and ld

Change the above duplicate files to symlinks.

[Michael Hope (michaelh1)]

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

The diff against the ancestor r2441 is available at:
 http://builds.linaro.org/toolchain/snapshots/crosstool-ng-linaro-1.13.1+bzr2442~michaelh1~lp988574.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+bzr2442~michaelh1~lp988574
cbuild-ancestor: lp:~linaro-toolchain-dev/crosstool-ng/linaro+bzr2441
cbuild-state: check

=== modified file 'contrib/linaro/build.mk'
--- contrib/linaro/build.mk	2012-06-26 01:42:43 +0000
+++ contrib/linaro/build.mk	2012-07-04 02:25:22 +0000
@@ -84,7 +84,7 @@
 # Build the win32 version using the just-built Linux compiler
 $(stamp)%-win32: $(stamp)%-linux
 	PATH=$(TOP):$(TOP)/$(BUILD)/$*-linux/install/bin:$$PATH \
-	$(MAKE) -f contrib/linaro/build.mk HOST=win32 TARGET=$* go
+	$(MAKE) -f contrib/linaro/build.mk HOST=win32 TARGET=$* EXE=.exe go
 	touch $@
 
 # Build a tarball of the runtime to overlay on the device
@@ -188,8 +188,14 @@
 	find $(FINAL) -type l -name lib32 -exec rm {} \;
 	# Remove the buildlog
 	rm -f $(FINAL)/build.log.bz2
-	# Remove the *-cc[.exe] symlink
+	# Remove the *-cc[.exe] symlink added by crosstool-NG
 	rm -f $(FINAL)/bin/*-cc*
+	# Convert the duplicates into symlinks
+	rm -f $(FINAL)/bin/*-{ld,c++,gcc}{,.exe}
+	cd $(FINAL)/bin \
+	&& ln -sf $(TARGET)-ld.bfd$(EXE) $(TARGET)-ld$(EXE) \
+	&& ln -sf $(TARGET)-g++$(EXE) $(TARGET)-c++$(EXE) \
+	&& ln -sf $(TARGET)-gcc-4*$(EXE) $(TARGET)-gcc$(EXE)
 	# Remove the populate script
 	rm -f $(FINAL)/bin/*-populate
 	# Remove the internal documentation