From 15dd6c2fa3b0953248a6a22b1b4b68c27b4c9c63 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Mon, 3 Aug 2015 16:46:29 +0200 Subject: [PATCH] xcompile: crossgcc lookup in parent paths, for painless libpayload support libpayload is calling the xcompile script from payloads/libpayload, so the script never finds the path on its own and has to be fed the right XGCCPATH by hand. This makes xcompile look for the parent path too, so that it can find the crossgcc toolchains when called from libpayload. Change-Id: Icc41bb68e3a43810f40f03ab1eb08af07a50a3de Signed-off-by: Paul Kocialkowski Reviewed-on: http://review.coreboot.org/11119 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- util/xcompile/xcompile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile index c1c42afb84..4560771bfe 100755 --- a/util/xcompile/xcompile +++ b/util/xcompile/xcompile @@ -20,7 +20,19 @@ # TMPFILE="" -XGCCPATH=${1:-"`pwd`/util/crossgcc/xgcc/bin/"} +XGCCPATH=$1 + +# libpayload crossgcc path +if [ -d "`pwd`/../../util/crossgcc/xgcc/bin/" ] +then + XGCCPATH=${XGCCPATH:-"`pwd`/../../util/crossgcc/xgcc/bin/"} +fi + +# coreboot crossgcc path +if [ -d "`pwd`/util/crossgcc/xgcc/bin/" ] +then + XGCCPATH=${XGCCPATH:-"`pwd`/util/crossgcc/xgcc/bin/"} +fi die() { echo "ERROR: $*" >&2