From 004295d86d7bbd6cfb0ce9767cbc1a2adbf61891 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Wed, 14 May 2014 14:26:07 +0200 Subject: xcompile: fail earlier on missing host tools No need to test all the cross compiler things if there's no host compiler or iasl. Also test that the alternatives work, instead of assuming iasl or cc are in the path. Change-Id: I1d2293873f4bf1bb525d794851ec20adddb05ac6 Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/5742 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan Reviewed-by: Stefan Reinauer --- util/xcompile/xcompile | 47 +++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) (limited to 'util/xcompile') diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile index 2ac82b62dd..81d5b3cda5 100644 --- a/util/xcompile/xcompile +++ b/util/xcompile/xcompile @@ -20,6 +20,7 @@ # TMPFILE="" +XGCCPATH=${1:-"`pwd`/util/crossgcc/xgcc/bin/"} die() { echo "ERROR: $*" >&2 @@ -36,6 +37,32 @@ program_exists() { type "$1" >/dev/null 2>&1 } + +if [ "$(${XGCCPATH}/iasl 2>/dev/null | grep -c ACPI)" -gt 0 ]; then + IASL=${XGCCPATH}iasl +elif [ "$(iasl 2>/dev/null | grep -c ACPI)" -gt 0 ]; then + IASL=iasl +else + echo "no iasl found" + exit 1 +fi + +if program_exists gcc; then + HOSTCC=gcc +elif program_exists cc; then + HOSTCC=cc +else + echo "no host compiler found" + exit 1 +fi + +cat </dev/null | grep -c ACPI)" -gt 0 ]; then - IASL=${XGCCPATH}iasl -else - IASL=iasl -fi - -if program_exists gcc; then - HOSTCC=gcc -else - HOSTCC=cc -fi - -cat <