From 3631977b63284585f584f2cf47162185afc56083 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Wed, 15 Sep 2021 02:39:52 +0000
Subject: [PATCH] Bug 1730078 - Build clang-tidy with clang.
 r=firefox-build-system-reviewers,andi

There are complications with building a 1-stage clang with gcc, so just
use clang. Eventually, the clang-tidy toolchains will be removed in
favor of providing clang-tidy from the clang toolchain itself anyways.

Differential Revision: https://phabricator.services.mozilla.com/D125158
---
 build/build-clang/clang-tidy-external-linux64.json |  6 +++---
 build/build-clang/clang-tidy-linux64.json          |  6 +++---
 taskcluster/ci/toolchain/clang-tidy.yml            | 10 ++--------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/build/build-clang/clang-tidy-external-linux64.json b/build/build-clang/clang-tidy-external-linux64.json
index cfc6857c0659..2de12c20bb4c 100644
--- a/build/build-clang/clang-tidy-external-linux64.json
+++ b/build/build-clang/clang-tidy-external-linux64.json
@@ -4,9 +4,9 @@
     "build_type": "Release",
     "assertions": false,
     "build_clang_tidy": true,
-    "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
-    "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
-    "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
+    "cc": "{MOZ_FETCHES_DIR}/clang/bin/clang",
+    "cxx": "{MOZ_FETCHES_DIR}/clang/bin/clang++",
+    "as": "{MOZ_FETCHES_DIR}/clang/bin/clang",
     "patches": [
         "clang-tidy-ci.patch"
     ],
diff --git a/build/build-clang/clang-tidy-linux64.json b/build/build-clang/clang-tidy-linux64.json
index 9b0afc81080a..9a9aa02bb984 100644
--- a/build/build-clang/clang-tidy-linux64.json
+++ b/build/build-clang/clang-tidy-linux64.json
@@ -4,9 +4,9 @@
     "build_type": "Release",
     "assertions": false,
     "build_clang_tidy": true,
-    "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
-    "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
-    "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
+    "cc": "{MOZ_FETCHES_DIR}/clang/bin/clang",
+    "cxx": "{MOZ_FETCHES_DIR}/clang/bin/clang++",
+    "as": "{MOZ_FETCHES_DIR}/clang/bin/clang",
     "patches": [
         "clang-tidy-ci.patch"
     ]
diff --git a/taskcluster/ci/toolchain/clang-tidy.yml b/taskcluster/ci/toolchain/clang-tidy.yml
index d300c69fbe5c..7fdae805ada3 100644
--- a/taskcluster/ci/toolchain/clang-tidy.yml
+++ b/taskcluster/ci/toolchain/clang-tidy.yml
@@ -40,8 +40,7 @@ linux64-clang-tidy:
         - trunk
     fetches:
         toolchain:
-            - linux64-binutils
-            - linux64-gcc-7
+            - linux64-clang-12
             - linux64-toolchain-sysroot
 
 macosx64-clang-tidy:
@@ -60,10 +59,8 @@ macosx64-clang-tidy:
         - trunk
     fetches:
         toolchain:
-            - linux64-binutils
             - linux64-cctools-port-clang-12
             - linux64-clang-12-macosx-cross
-            - linux64-gcc-7
             - macosx64-sdk-10.12
 
 macosx64-arch64-clang-tidy:
@@ -85,10 +82,8 @@ macosx64-arch64-clang-tidy:
         - trunk
     fetches:
         toolchain:
-            - linux64-binutils
             - linux64-cctools-port-clang-12
             - linux64-clang-12-macosx-cross
-            - linux64-gcc-7
             - macosx64-sdk-11.0
 
 win64-clang-tidy:
@@ -141,6 +136,5 @@ linux64-clang-tidy-external:
         fetch:
             - civet-source
         toolchain:
-            - linux64-binutils
-            - linux64-gcc-7
+            - linux64-clang-12
             - linux64-toolchain-sysroot