From fc89cd64382d6fefd1bada10c4721f667c5263d4 Mon Sep 17 00:00:00 2001 From: David Major Date: Tue, 1 Dec 2020 04:32:55 +0000 Subject: [PATCH] Bug 1679909 - Use PATH instead of -B in build-compiler-rt.sh r=glandium As of version 12, clang doesn't accept `-B` for target-prefixed binaries. This is said to be for GCC compatibility: https://github.com/llvm/llvm-project/commit/3452a0d8c17f7166f479706b293caf6ac76ffd90 Differential Revision: https://phabricator.services.mozilla.com/D98261 --- taskcluster/scripts/misc/build-compiler-rt.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/taskcluster/scripts/misc/build-compiler-rt.sh b/taskcluster/scripts/misc/build-compiler-rt.sh index bd9366bc3d91..b534ad8711cd 100755 --- a/taskcluster/scripts/misc/build-compiler-rt.sh +++ b/taskcluster/scripts/misc/build-compiler-rt.sh @@ -4,6 +4,8 @@ set -e [ "$1" != "aarch64-apple-darwin" ] && echo $1 is not supported yet && exit 1 +export PATH="$MOZ_FETCHES_DIR/cctools/bin:$PATH" + mkdir compiler-rt cd compiler-rt @@ -18,8 +20,8 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DLLVM_ENABLE_ASSERTIONS=OFF \ -DLLVM_CONFIG_PATH=$MOZ_FETCHES_DIR/clang/bin/llvm-config \ - -DCMAKE_C_FLAGS="-target aarch64-apple-darwin -mcpu=apple-a12 -B $MOZ_FETCHES_DIR/cctools/bin -isysroot $MOZ_FETCHES_DIR/MacOSX11.0.sdk" \ - -DCMAKE_CXX_FLAGS="-target aarch64-apple-darwin -mcpu=apple-a12 -B $MOZ_FETCHES_DIR/cctools/bin -isysroot $MOZ_FETCHES_DIR/MacOSX11.0.sdk" \ + -DCMAKE_C_FLAGS="-target aarch64-apple-darwin -mcpu=apple-a12 -isysroot $MOZ_FETCHES_DIR/MacOSX11.0.sdk" \ + -DCMAKE_CXX_FLAGS="-target aarch64-apple-darwin -mcpu=apple-a12 -isysroot $MOZ_FETCHES_DIR/MacOSX11.0.sdk" \ -DCMAKE_SYSTEM_NAME=Darwin \ -DCMAKE_SYSTEM_VERSION=11.0 \ -DDARWIN_osx_ARCHS=arm64 \