From 05b346bbc353472d1929e641238085d0d2e36420 Mon Sep 17 00:00:00 2001
From: Martin Roth <martinroth@google.com>
Date: Wed, 30 Nov 2016 16:38:25 -0700
Subject: [PATCH] UPSTREAM: util/abuild: Don't set XGCCPATH if it's in the
 environment

BUG=None
BRANCH=None
TEST=None

Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/17723
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>

Change-Id: I0fa231ca3d33300a671810e994c5be54ac10a18b
Reviewed-on: https://chromium-review.googlesource.com/425280
Commit-Ready: Furquan Shaikh <furquan@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
---
 util/abuild/abuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/util/abuild/abuild b/util/abuild/abuild
index 7988feda88..7c4e29fcbf 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -31,8 +31,10 @@ export KCONFIG_OVERWRITECONFIG=1
 # path to payload. Should be more generic
 PAYLOAD=/dev/null
 
-# path to coreboot XGCC
-XGCCPATH="${TOP}/util/crossgcc/xgcc/bin/"
+# get path to coreboot XGCC if it's not already set
+if [ -z "$XGCCPATH" ]; then
+	XGCCPATH="${TOP}/util/crossgcc/xgcc/bin/"
+fi
 
 # Add XGCC to the path.
 if [ -d "$XGCCPATH" ] && [[ ":$PATH:" != *":$XGCCPATH:"* ]]; then