Bug 1724522 - Only build clang-12 and clang-trunk with wasi-sysroot. r=firefox-build-system-reviewers,mhentges

We don't need wasi support in versions other than the ones currently used
to build Firefox.

Differential Revision: https://phabricator.services.mozilla.com/D122401

build/build-clang/clang-10-linux64.json

@@ -8,7 +8,6 @@
     "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
     "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
     "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
-    "wasi-sysroot": "{MOZ_FETCHES_DIR}/wasi-sysroot",
     "patches": [
       "static-llvm-symbolizer.patch",
       "find_symbolizer_linux_clang_10.patch",

build/build-clang/clang-11-linux64.json

@@ -8,7 +8,6 @@
     "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
     "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
     "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
-    "wasi-sysroot": "{MOZ_FETCHES_DIR}/wasi-sysroot",
     "patches": [
       "static-llvm-symbolizer.patch",
       "find_symbolizer_linux_clang_10.patch",

build/build-clang/clang-11-macosx64.json

@@ -12,7 +12,6 @@
     "ranlib": "{MOZ_FETCHES_DIR}/cctools/bin/x86_64-apple-darwin-ranlib",
     "libtool": "{MOZ_FETCHES_DIR}/cctools/bin/x86_64-apple-darwin-libtool",
     "ld": "{MOZ_FETCHES_DIR}/clang/bin/clang",
-    "wasi-sysroot": "{MOZ_FETCHES_DIR}/wasi-sysroot",
     "patches": [
       "static-llvm-symbolizer.patch",
       "compiler-rt-cross-compile.patch",

build/build-clang/clang-11-win64.json

@@ -8,7 +8,6 @@
     "cc": "cl.exe",
     "cxx": "cl.exe",
     "ml": "ml64.exe",
-    "wasi-sysroot": "{MOZ_FETCHES_DIR}/wasi-sysroot",
     "patches": [
       "unpoison-thread-stacks_clang_10.patch",
       "downgrade-mangling-error.patch",

taskcluster/ci/toolchain/clang.yml

@@ -120,7 +120,6 @@ linux64-clang-10:
             - linux64-binutils
             - linux64-gcc-7
             - linux64-toolchain-sysroot
-            - wasi-sysroot
 
 linux64-clang-11:
     description: "Clang 11 toolchain build"
@@ -144,7 +143,6 @@ linux64-clang-11:
             - linux64-binutils
             - linux64-gcc-7
             - linux64-toolchain-sysroot
-            - wasi-sysroot-11
 
 linux64-clang-trunk:
     description: "Clang trunk toolchain build"
@@ -281,7 +279,6 @@ macosx64-clang-11:
             - linux64-clang-11-macosx-cross
             - linux64-gcc-7
             - macosx64-sdk-10.12
-            - wasi-sysroot-11
 
 macosx64-aarch64-clang-11:
     description: "Clang 11 toolchain build"
@@ -312,7 +309,6 @@ macosx64-aarch64-clang-11:
             - linux64-clang-11-macosx-cross
             - linux64-gcc-7
             - macosx64-sdk-11.0
-            - wasi-sysroot-11
 
 win64-clang-11:
     description: "Clang-cl 11 toolchain build"
@@ -341,8 +337,6 @@ win64-clang-11:
             - clang-11
             - cmake
             - ninja
-        toolchain:
-            - wasi-sysroot-11
 
 win64-clang-11-2stage:
     description: "Clang-cl 11 toolchain 2-stage quick build"

taskcluster/ci/toolchain/misc.yml

@@ -181,26 +181,6 @@ browsertime:
         toolchain:
             - linux64-node
 
-wasi-sysroot-11:
-    description: "wasi sysroot build using clang-11"
-    attributes:
-        local-toolchain: true
-    treeherder:
-        symbol: TL(wasi-sysroot-11)
-    worker-type: b-linux-xlarge
-    run-on-projects: [trunk]
-    run:
-        script: build-wasi-sysroot.sh
-        sparse-profile: null
-        toolchain-artifact: public/build/wasi-sysroot.tar.xz
-    fetches:
-        fetch:
-            - clang-11
-            - wasi-sdk
-        toolchain:
-            - linux64-binutils
-            - linux64-gcc-7
-
 wasi-sysroot-12:
     description: "wasi sysroot build using clang-12"
     attributes: