Backed out changeset ecd51b6bb390 (bug 1807986) for OS X build bustages

taskcluster/ci/docker-image/kind.yml

@@ -143,8 +143,6 @@ jobs:
         symbol: I(deb11-toolchain)
         parent: debian11-base
         definition: toolchain-build
-        packages:
-            - deb11-cmake
     android-build:
         symbol: I(agb)
         parent: debian11-base

taskcluster/ci/fetch/toolchains.yml

@@ -404,12 +404,12 @@ ninja:
         add-prefix: ninja/bin/
 
 cmake:
-    description: cmake 3.25.1
+    description: cmake 3.15.1
     fetch:
         type: static-url
-        url: https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-windows-x86_64.zip
-        sha256: d93958d87cc9b91983489f0b37a268b03a3c891894d11f5437fa2a5ce94aab24
-        size: 41460154
+        url: https://github.com/Kitware/CMake/releases/download/v3.15.1/cmake-3.15.1-win64-x64.zip
+        sha256: 82a0edfed4cb0b45b25d2f99e621d3ed4014f66191d8f3c7eadf1d9ccf9c461b
+        size: 32214192
         artifact-name: cmake.tar.zst
         strip-components: 1
         add-prefix: cmake/

taskcluster/ci/packages/debian.yml

@@ -23,16 +23,6 @@ deb11-mercurial:
                          -e "s/__DATE__/$(date --rfc-2822)/" \
                          -e "s/__CODENAME__/bullseye/" debian/changelog
 
-deb11-cmake:
-    description: "cmake"
-    treeherder:
-        symbol: Deb11(cmake)
-    run:
-        dist: bullseye
-        dsc:
-            url: http://snapshot.debian.org/archive/debian/20221201T090253Z/pool/main/c/cmake/cmake_3.25.1-1.dsc
-            sha256: 508b262eee8f18c8924bb4e1b89596fb208efa2fe6bde270d16552d1dc3a0d65
-
 deb11-valgrind:
     description: "Valgrind for Debian bullseye"
     treeherder:

taskcluster/scripts/misc/build-clang.sh

@@ -17,17 +17,10 @@ UPLOAD_DIR= taskcluster/scripts/misc/repack-clang.sh
 
 case "$CONFIGS" in
 *macosx64*)
-  # cmake makes decisions based on the output of the mac-only sw_vers, which is
-  # obviously missing when cross-compiling, so create a fake one. The exact
-  # version doesn't really matter: as of writing, cmake checks at most for 10.5.
-  mkdir -p $ORIGPWD/bin
-  echo "#!/bin/sh" >> $ORIGPWD/bin/sw_vers
-  echo echo 10.12 >> $ORIGPWD/bin/sw_vers
-  chmod +x $ORIGPWD/bin/sw_vers
   # these variables are used in build-clang.py
   export CROSS_CCTOOLS_PATH=$MOZ_FETCHES_DIR/cctools
   export CROSS_SYSROOT=$(ls -d $MOZ_FETCHES_DIR/MacOSX1*.sdk)
-  export PATH=$PATH:$CROSS_CCTOOLS_PATH/bin:$ORIGPWD/bin
+  export PATH=$PATH:$CROSS_CCTOOLS_PATH/bin
   ;;
 *win64*)
   export UPLOAD_DIR=$ORIGPWD/public/build