Paul Kocialkowski (contact@paulk.fr) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11119
-gerrit
commit 7144ee85fa7efbd9e21bdfbb80ae5f7912deb6c1 Author: Paul Kocialkowski contact@paulk.fr Date: Mon Aug 3 16:46:29 2015 +0200
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 contact@paulk.fr --- util/xcompile/xcompile | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile index c1c42af..bc1a7e3 100755 --- a/util/xcompile/xcompile +++ b/util/xcompile/xcompile @@ -20,7 +20,18 @@ #
TMPFILE="" -XGCCPATH=${1:-"`pwd`/util/crossgcc/xgcc/bin/"} + +# libpayload crossgcc path +if [ -d "`pwd`/../../util/crossgcc/xgcc/bin/" ] +then + XGCCPATH=${1:-"`pwd`/../../util/crossgcc/xgcc/bin/"} +fi + +# coreboot libgcc path +if [ -d "`pwd`/util/crossgcc/xgcc/bin/" ] +then + XGCCPATH=${1:-"`pwd`/util/crossgcc/xgcc/bin/"} +fi
die() { echo "ERROR: $*" >&2