Bug 1755415 - Stop using cctools to build mac compiler-rt. r=firefox-build-system-reviewers,mhentges

This allows to build the compiler-rt earlier.

Differential Revision: https://phabricator.services.mozilla.com/D138747
This commit is contained in:
Mike Hommey 2022-02-16 08:24:40 +00:00
Родитель 3718f96ea3
Коммит 722d7cd010
2 изменённых файлов: 4 добавлений и 5 удалений

Просмотреть файл

@ -143,7 +143,6 @@ macosx64-x64-compiler-rt-13:
fetch:
- clang-13
toolchain:
- linux64-cctools-port
- linux64-clang-13-stage1
- macosx64-sdk-11.0
@ -161,7 +160,6 @@ macosx64-aarch64-compiler-rt-13:
fetch:
- clang-13
toolchain:
- linux64-cctools-port
- linux64-clang-13-stage1
- macosx64-sdk-11.0

Просмотреть файл

@ -53,11 +53,13 @@ esac
case "$target" in
*-apple-darwin)
EXTRA_CMAKE_FLAGS="
-DCMAKE_LINKER=$MOZ_FETCHES_DIR/cctools/bin/$target-ld
-DCMAKE_LIPO=$MOZ_FETCHES_DIR/cctools/bin/lipo
-DCMAKE_LINKER=$MOZ_FETCHES_DIR/clang/bin/ld64.lld
-DCMAKE_LIPO=$MOZ_FETCHES_DIR/clang/bin/llvm-lipo
-DCMAKE_SYSTEM_NAME=Darwin
-DCMAKE_SYSTEM_VERSION=$MACOSX_DEPLOYMENT_TARGET
-DCMAKE_OSX_SYSROOT=$MOZ_FETCHES_DIR/MacOSX11.0.sdk
-DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld
-DCMAKE_SHARED_LINKER_FLAGS=-fuse-ld=lld
-DDARWIN_osx_ARCHS=$arch
-DDARWIN_osx_SYSROOT=$MOZ_FETCHES_DIR/MacOSX11.0.sdk
-DDARWIN_macosx_OVERRIDE_SDK_VERSION=11.0
@ -68,7 +70,6 @@ case "$target" in
# Give it a fake one.
echo "#!/bin/sh" > codesign
chmod +x codesign
PATH="$PWD:$MOZ_FETCHES_DIR/cctools/bin:$PATH"
;;
*-linux-android)
cflags="