From 722d7cd01080d09c696ccf8d19d5a11cc6258a1e Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Wed, 16 Feb 2022 08:24:40 +0000
Subject: [PATCH] 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
---
 taskcluster/ci/toolchain/compiler-rt.yml      | 2 --
 taskcluster/scripts/misc/build-compiler-rt.sh | 7 ++++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/taskcluster/ci/toolchain/compiler-rt.yml b/taskcluster/ci/toolchain/compiler-rt.yml
index 6f8369d14be2..68eb4c87da99 100644
--- a/taskcluster/ci/toolchain/compiler-rt.yml
+++ b/taskcluster/ci/toolchain/compiler-rt.yml
@@ -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
 
diff --git a/taskcluster/scripts/misc/build-compiler-rt.sh b/taskcluster/scripts/misc/build-compiler-rt.sh
index e76c054193e8..8d45689c7a6b 100755
--- a/taskcluster/scripts/misc/build-compiler-rt.sh
+++ b/taskcluster/scripts/misc/build-compiler-rt.sh
@@ -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="