From 719d85bf569697a489a6ba7416870f4ec6d5b086 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Tue, 27 Jul 2021 22:30:34 +0200 Subject: util/xcompile: Allow overriding default compiler path When looking for C compilers, xcompile uses the "" prefix to "gcc" and "clang" as a last-resort option. This fails in environments where such default names are blocked to prevent "unclean" builds - such as Chrome OS. Allow overriding this prefix using the GENERIC_COMPILER_PREFIX variable that is hopefully both descriptive enough to suggest what it is for and unusual enough to not trigger by chance. Change-Id: I16239f66730f1dbcb7482f223cea4ee5957af10c Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/c/coreboot/+/56643 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- util/xcompile/xcompile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'util/xcompile') diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile index 9fdda034066f..4950a9e282f7 100755 --- a/util/xcompile/xcompile +++ b/util/xcompile/xcompile @@ -10,6 +10,8 @@ if [ "$1" = "--debug" ]; then set -x fi +# GENERIC_COMPILER_PREFIX defaults to empty but can be used to override +# compiler search behavior TMPFILE="" XGCCPATH=$1 @@ -421,7 +423,7 @@ test_architecture() { # Search toolchain by checking assembler capability. for TBFDARCH in $TBFDARCHS; do - for gccprefix in $search ""; do + for gccprefix in $search "$GENERIC_COMPILER_PREFIX"; do program_exists "${gccprefix}as" || continue for endian in $TENDIAN ""; do { testas "$gccprefix" "$TWIDTH" "$TBFDARCH" \ @@ -439,7 +441,7 @@ test_architecture() { fi for clang_arch in $TCLIST invalid; do - for clang_prefix in $search $XGCCPATH ""; do + for clang_prefix in $search $XGCCPATH "$GENERIC_COMPILER_PREFIX"; do testcc "${clang_prefix}clang" "-target ${clang_arch}-$TABI -c" && break 2 done done -- cgit v1.2.3