summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Lindholm <leif.lindholm@linaro.org>2019-07-19 12:59:18 +0100
committerLeif Lindholm <leif.lindholm@linaro.org>2019-07-19 12:59:18 +0100
commit94dc4cf69aa8d7eaa40e5f1b6789c31549a2233c (patch)
tree7306b130bf78397b6f15baa9c68daa14219b4161
parent0407bb1a30ece4a305486535df5d4835c8241882 (diff)
edk2-build.sh: don't set ${PLATFORM_TOOLCHAIN}_BIN for clangHEADmaster
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 <leif.lindholm@linaro.org>
-rwxr-xr-xedk2-build.sh4
1 files changed, 3 insertions, 1 deletions
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"