xcompile: Also try clang variants under the $triplet-clang scheme

That seems to be the more reliable way to build clang cross compilers
for now.

Change-Id: I14fe767d20f91b64e96c909291760bddcd108e5c
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/19660
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Patrick Georgi 2017-05-10 22:06:31 +02:00
parent c6ef9dbd94
commit f138320f9e
1 changed files with 4 additions and 2 deletions

View File

@ -435,14 +435,16 @@ test_architecture() {
fi fi
for clang_arch in $TCLIST invalid; do for clang_arch in $TCLIST invalid; do
testcc "${XGCCPATH}clang" "-target ${clang_arch}-$TABI -c" && break for clang_prefix in $search $XGCCPATH ""; do
testcc "${clang_prefix}clang" "-target ${clang_arch}-$TABI -c" && break 2
done
done done
if [ "invalid" != "$clang_arch" ]; then if [ "invalid" != "$clang_arch" ]; then
# FIXME: this may break in a clang && !gcc configuration, # FIXME: this may break in a clang && !gcc configuration,
# but that's more of a clang limitation. Let's be optimistic # but that's more of a clang limitation. Let's be optimistic
# that this will change in the future. # that this will change in the future.
CLANG="${XGCCPATH}clang" CLANG="${clang_prefix}clang"
CFLAGS_CLANG="-target ${clang_arch}-${TABI} --rtlib=${CLANG_RUNTIME} $CFLAGS_CLANG -ccc-gcc-name ${GCC}" CFLAGS_CLANG="-target ${clang_arch}-${TABI} --rtlib=${CLANG_RUNTIME} $CFLAGS_CLANG -ccc-gcc-name ${GCC}"
fi fi
} }