From 94dc4cf69aa8d7eaa40e5f1b6789c31549a2233c Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Fri, 19 Jul 2019 12:59:18 +0100 Subject: edk2-build.sh: don't set ${PLATFORM_TOOLCHAIN}_BIN for clang The hack to make it possible to cross-build x86 unfortunately broke *any* builds using clang. So make sure we don't set ${PLATFORM_TOOLCHAIN}_BIN for clang builds Signed-off-by: Leif Lindholm --- edk2-build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/edk2-build.sh b/edk2-build.sh index 468138e..bd06a52 100755 --- a/edk2-build.sh +++ b/edk2-build.sh @@ -99,7 +99,9 @@ function do_build echo "PLATFORM_TOOLCHAIN is ${PLATFORM_TOOLCHAIN}" export ${PLATFORM_TOOLCHAIN}_${PLATFORM_ARCH}_PREFIX=$CROSS_COMPILE - export ${PLATFORM_TOOLCHAIN}_BIN=$CROSS_COMPILE + if [ $TOOLCHAIN != "clang" ]; then + export ${PLATFORM_TOOLCHAIN}_BIN=$CROSS_COMPILE + fi echo "Toolchain prefix: ${PLATFORM_TOOLCHAIN}_${PLATFORM_ARCH}_PREFIX=$CROSS_COMPILE" export PACKAGES_PATH="$PLATFORM_PACKAGES_PATH" -- cgit v1.2.3