summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Jones <marcj303@gmail.com>2011-10-07 17:20:30 -0600
committerPatrick Georgi <patrick@georgi-clan.de>2011-10-23 18:55:27 +0200
commit616da1ee7fc45bed76e420fb5060939ef0d77ea1 (patch)
tree68ced1db024269df519232addba2c8988e1e63e0
parent5cfd583c5c2d803dd240768ec343b5a95f42c785 (diff)
downloadcoreboot-616da1ee7fc45bed76e420fb5060939ef0d77ea1.tar.xz
Allow XGCCPATH to be set on the make command line.
The xgcc toolchain may be moved by the user and passed in on the commandline. Updates the Makefile and the xcompile script. Change-Id: I05797b2cabce39bdd7868c2515f30d34043fc8cc Signed-off-by: Marc Jones <marcj303@gmail.com> Reviewed-on: http://review.coreboot.org/318 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
-rw-r--r--Makefile2
-rw-r--r--util/xcompile/xcompile3
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 44a1d63198..c5438979f7 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ ifeq ($(INNER_SCANBUILD),y)
CC_real:=$(CC)
endif
-$(if $(wildcard .xcompile),,$(eval $(shell bash util/xcompile/xcompile > .xcompile)))
+$(if $(wildcard .xcompile),,$(eval $(shell bash util/xcompile/xcompile $(XGCCPATH) > .xcompile)))
include .xcompile
ifeq ($(INNER_SCANBUILD),y)
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index b68e1b3a79..9a0a295c75 100644
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -35,7 +35,8 @@ for make in make gmake gnumake; do
done
GCCPREFIX=invalid
-XGCCPATH="`pwd`/util/crossgcc/xgcc/bin/"
+XGCCPATH=${1:-"`pwd`/util/crossgcc/xgcc/bin/"}
+echo '#XGCCPATH='${XGCCPATH}
TMPFILE=`mktemp /tmp/temp.XXXX 2>/dev/null || echo /tmp/temp.78gOIUGz`
touch $TMPFILE