Bug 1699380 - Add an arm64 mac toolchain task for dump-syms. r=firefox-build-system-reviewers,mhentges

Differential Revision: https://phabricator.services.mozilla.com/D108922
This commit is contained in:
Mike Hommey 2021-03-24 05:15:10 +00:00
parent 024e0b2323
commit 8f946602e9
2 changed files with 26 additions and 6 deletions

View File

@ -41,9 +41,23 @@ macosx64-dump-syms:
- linux64-clang-11
- linux64-cctools-port-clang-11
- linux64-llvm-dsymutil
- linux64-binutils
- macosx64-sdk-10.12
macosx64-aarch64-dump-syms:
treeherder:
symbol: TM(dump_syms-arm64)
worker-type: b-linux
run:
arguments: ['aarch64-apple-darwin']
toolchain-artifact: public/build/dump_syms.tar.xz
fetches:
toolchain:
- linux64-rust-macos-1.49
- linux64-clang-11
- linux64-cctools-port-clang-11
- linux64-llvm-dsymutil
- macosx64-sdk-11.0
win64-dump-syms:
treeherder:
symbol: TW64(dump_syms)

View File

@ -30,15 +30,20 @@ cd $MOZ_FETCHES_DIR/$PROJECT
case "$(uname -s)" in
Linux)
if [ "$TARGET" == "x86_64-apple-darwin" ]; then
case "$TARGET" in
*-apple-darwin)
export PATH="$MOZ_FETCHES_DIR/llvm-dsymutil/bin:$PATH"
export PATH="$MOZ_FETCHES_DIR/cctools/bin:$PATH"
export RUSTFLAGS="-C linker=$GECKO_PATH/taskcluster/scripts/misc/osx-cross-linker"
export CC="$MOZ_FETCHES_DIR/clang/bin/clang"
export TARGET_CC="$MOZ_FETCHES_DIR/clang/bin/clang -isysroot $MOZ_FETCHES_DIR/MacOSX10.12.sdk"
export TARGET_CXX="$MOZ_FETCHES_DIR/clang/bin/clang++ -isysroot $MOZ_FETCHES_DIR/MacOSX10.12.sdk -stdlib=libc++"
if test "$TARGET" = "aarch64-apple-darwin"; then
export SDK_VER=11.0
fi
export TARGET_CC="$MOZ_FETCHES_DIR/clang/bin/clang -isysroot $MOZ_FETCHES_DIR/MacOSX${SDK_VER:-10.12}.sdk"
export TARGET_CXX="$MOZ_FETCHES_DIR/clang/bin/clang++ -isysroot $MOZ_FETCHES_DIR/MacOSX${SDK_VER:-10.12}.sdk -stdlib=libc++"
cargo build --verbose --release --target $TARGET
else
;;
*)
export RUSTFLAGS="-Clinker=clang++ -C link-arg=--sysroot=$MOZ_FETCHES_DIR/sysroot"
export CC=clang
export CXX=clang++
@ -46,7 +51,8 @@ Linux)
export CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0 --sysroot=$MOZ_FETCHES_DIR/sysroot"
export PATH="$MOZ_FETCHES_DIR/clang/bin:$MOZ_FETCHES_DIR/binutils/bin:$PATH"
cargo build --verbose --release --features "vendored-openssl"
fi
;;
esac
;;
MINGW*)
cargo build --verbose --release