[coreboot-gerrit] New patch to review for coreboot: util/xcompile: Look for host tools in xgcc-host/ first

[Nico Huber]

Nico Huber ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13470

-gerrit

commit 16446549a7ced8ef3a9a37733bd59254b3e2123d
Author: Nico Huber 
Date:   Tue Jan 26 16:55:12 2016 +0100

util/xcompile: Look for host tools in xgcc-host/ first

Look in the new xgcc-host/ dir that will be introduced in follow-up
    commits to util/crossgcc.

Change-Id: I02a8e18c201e12502caca2be0a8e56ec075e551b
    Signed-off-by: Nico Huber 
---
 util/xcompile/xcompile | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index d798961..1c77d90 100755
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -17,19 +17,23 @@

TMPFILE=""
 XGCCPATH=$1
+XGCCHOSTPATH=

# libpayload crossgcc path
 if [ -d "$(pwd)/../../util/crossgcc/xgcc/bin/" ]
 then
-	XGCCPATH=${XGCCPATH:-"$(pwd)/../../util/crossgcc/xgcc/bin/"}
+	XGCCDIR="$(pwd)/../../util/crossgcc/xgcc"
 fi

# coreboot crossgcc path
 if [ -d "$(pwd)/util/crossgcc/xgcc/bin/" ]
 then
-	XGCCPATH=${XGCCPATH:-"$(pwd)/util/crossgcc/xgcc/bin/"}
+	XGCCDIR="$(pwd)/util/crossgcc/xgcc"
 fi

+XGCCPATH=${XGCCPATH:-"${XGCCDIR}/bin/"}
+XGCCHOSTPATH=${XGCCHOSTPATH:-"${XGCCDIR}-host/bin/"}
+
 die() {
    echo "ERROR: $*" >&2
    exit 1
@@ -52,13 +56,17 @@ program_exists() {
 }

-if [ "$("${XGCCPATH}/iasl" 2>/dev/null | grep -c ACPI)" -gt 0 ]; then
+if [ -n "${XGCCHOSTPATH}" -a "$("${XGCCHOSTPATH}/iasl" 2>/dev/null | grep -c ACPI)" -gt 0 ]; then
+	IASL=${XGCCHOSTPATH}iasl
+elif [ "$("${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
 fi

-if program_exists gcc; then
+if [ -n "${XGCCHOSTPATH}" -a -x "${XGCCHOSTPATH}gcc" ]; then
+	HOSTCC=${XGCCHOSTPATH}gcc
+elif program_exists gcc; then
    HOSTCC=gcc
 elif program_exists cc; then
    HOSTCC=cc