From 616da1ee7fc45bed76e420fb5060939ef0d77ea1 Mon Sep 17 00:00:00 2001 From: Marc Jones Date: Fri, 7 Oct 2011 17:20:30 -0600 Subject: [PATCH] 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 Reviewed-on: http://review.coreboot.org/318 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- Makefile | 2 +- util/xcompile/xcompile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 44a1d6319..c5438979f 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 b68e1b3a7..9a0a295c7 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 -- 2.25.1