From 3f793f3d90a0705ae6a4b16ba79dd5f7c921e485 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Wed, 1 Feb 2023 15:09:39 +0000
Subject: [PATCH] Bug 1812974 - Remove cctools dependency for clang toolchains.
 r=firefox-build-system-reviewers,ahochheiden

The non-raw clang toolchains do still need cctools for lipo when
aggregating the compiler-rts.

Differential Revision: https://phabricator.services.mozilla.com/D168034
---
 build/build-clang/build-clang.py        | 4 ++++
 taskcluster/ci/toolchain/clang-tidy.yml | 2 --
 taskcluster/ci/toolchain/clang.yml      | 5 -----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/build/build-clang/build-clang.py b/build/build-clang/build-clang.py
index 35bd635a89ab..3863527ea036 100755
--- a/build/build-clang/build-clang.py
+++ b/build/build-clang/build-clang.py
@@ -661,7 +661,11 @@ def main():
         extra_cflags2 = []
         extra_cxxflags2 = []
         extra_asmflags = []
+        # It's unfortunately required to specify the linker used here because
+        # the linker flags are used in LLVM's configure step before
+        # -DLLVM_ENABLE_LLD is actually processed.
         extra_ldflags = [
+            "-fuse-ld=lld",
             "-Wl,-dead_strip",
         ]
     elif is_linux(target):
diff --git a/taskcluster/ci/toolchain/clang-tidy.yml b/taskcluster/ci/toolchain/clang-tidy.yml
index a1094c0ce1d6..0d6e6995c1e5 100644
--- a/taskcluster/ci/toolchain/clang-tidy.yml
+++ b/taskcluster/ci/toolchain/clang-tidy.yml
@@ -58,7 +58,6 @@ macosx64-clang-tidy:
             - 'build/build-clang/macosx64.json'
     fetches:
         toolchain:
-            - linux64-cctools-port
             - linux64-clang-15
             - macosx64-sdk-toolchain
 
@@ -80,7 +79,6 @@ macosx64-arch64-clang-tidy:
             - 'build/build-clang/macosx64-aarch64.json'
     fetches:
         toolchain:
-            - linux64-cctools-port
             - linux64-clang-15
             - macosx64-sdk-toolchain
 
diff --git a/taskcluster/ci/toolchain/clang.yml b/taskcluster/ci/toolchain/clang.yml
index 377759084d43..16506e63fcb5 100644
--- a/taskcluster/ci/toolchain/clang.yml
+++ b/taskcluster/ci/toolchain/clang.yml
@@ -92,7 +92,6 @@ macosx64-clang-14-raw:
         fetch:
             - clang-14
         toolchain:
-            - linux64-cctools-port
             - linux64-clang-14-stage1
             - macosx64-sdk-toolchain
 
@@ -277,7 +276,6 @@ macosx64-clang-15-raw:
         fetch:
             - clang-15
         toolchain:
-            - linux64-cctools-port
             - linux64-clang-15-stage1
             - linux64-clang-15-profile
             - macosx64-sdk-toolchain
@@ -344,7 +342,6 @@ macosx64-aarch64-clang-15-raw:
         fetch:
             - clang-15
         toolchain:
-            - linux64-cctools-port
             - linux64-clang-15-stage1
             - linux64-clang-15-profile
             - macosx64-sdk-toolchain
@@ -665,7 +662,6 @@ macosx64-clang-trunk-raw:
         fetch:
             - clang-trunk
         toolchain:
-            - linux64-cctools-port
             - linux64-clang-trunk-stage1
             - linux64-clang-trunk-profile
             - macosx64-sdk-toolchain
@@ -734,7 +730,6 @@ macosx64-aarch64-clang-trunk-raw:
         fetch:
             - clang-trunk
         toolchain:
-            - linux64-cctools-port
             - linux64-clang-trunk-stage1
             - linux64-clang-trunk-profile
             - macosx64-sdk-toolchain