From af6cc694f4d343ecdea57c89736ad3b1c1ffaf2a Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 16 Jun 2026 10:37:37 +0200
Subject: [PATCH] gh-14208: Install LLVM 22 for rust 1.95 (gh-14222)

---
 .github/workflows/linux-release-build.yml   | 6 ++++++
 .github/workflows/macos-release-build.yml   | 6 ++++++
 .github/workflows/src/release-build.sh      | 9 +++++++++
 .github/workflows/windows-release-build.yml | 9 ++++++++-
 .llvm-version                               | 1 +
 configs/linux/mozconfig                     | 9 ---------
 6 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 .llvm-version

diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml
index 5e5a32bff..169f5812e 100644
--- a/.github/workflows/linux-release-build.yml
+++ b/.github/workflows/linux-release-build.yml
@@ -83,6 +83,12 @@ jobs:
         run: |
           npm ci
 
+      - name: Install LLVM
+        run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x llvm.sh
+          sudo ./llvm.sh $(cat .llvm-version)
+
       - name: Load Surfer CI setup
         run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml
index b3395f0f1..9d9d375ba 100644
--- a/.github/workflows/macos-release-build.yml
+++ b/.github/workflows/macos-release-build.yml
@@ -114,6 +114,12 @@ jobs:
         run: |
           npm ci
 
+      - name: Install LLVM
+        run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x llvm.sh
+          sudo ./llvm.sh $(cat .llvm-version)
+
       - name: Load surfer CI setup
         run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
diff --git a/.github/workflows/src/release-build.sh b/.github/workflows/src/release-build.sh
index fbccedce2..4cd0c1c7b 100644
--- a/.github/workflows/src/release-build.sh
+++ b/.github/workflows/src/release-build.sh
@@ -8,6 +8,15 @@ if command -v apt-get &> /dev/null; then
   sudo apt-get install -y xvfb libnvidia-egl-wayland1 mesa-utils libgl1-mesa-dri
 fi
 
+LLVM_VERSION=$(cat .llvm-version)
+if test -d "$HOME/.mozbuild/clang-$LLVM_VERSION/bin"; then
+    export CC="$HOME/.mozbuild/clang-$LLVM_VERSION/bin/clang"
+    export CXX="$HOME/.mozbuild/clang-$LLVM_VERSION/bin/clang++"
+else
+    export CC=clang-$LLVM_VERSION
+    export CXX=clang-$LLVM_VERSION++
+fi
+
 mkdir -p ~/.zen-keys
 echo "$ZEN_SAFEBROWSING_API_KEY" > ~/.zen-keys/safebrowsing.dat
 echo "$ZEN_MOZILLA_API_KEY" > ~/.zen-keys/mozilla.dat
diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml
index 8bbfbebef..e4972cac6 100644
--- a/.github/workflows/windows-release-build.yml
+++ b/.github/workflows/windows-release-build.yml
@@ -87,6 +87,12 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y python3 python3-pip dos2unix yasm nasm build-essential libgtk2.0-dev libpython3-dev m4 uuid libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdrm-dev libdbus-glib-1-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb lld llvm --fix-missing
 
+      - name: Install LLVM
+        run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x llvm.sh
+          sudo ./llvm.sh $(cat .llvm-version)
+
       - name: Load Surfer CI setup
         run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
@@ -234,7 +240,8 @@ jobs:
           ZEN_RELEASE_BRANCH: ${{ inputs.release-branch }}
           ZEN_SAFEBROWSING_API_KEY: ${{ secrets.ZEN_SAFEBROWSING_API_KEY }}
           ZEN_MOZILLA_API_KEY: ${{ secrets.ZEN_MOZILLA_API_KEY }}
-          ZEN_GOOGLE_LOCATION_SERVICE_API_KEY: ${{ secrets.ZEN_GOOGLE_LOCATION_SERVICE_API_KEY }}
+          # Firefox doesn't support location service for Windows
+          # ZEN_GOOGLE_LOCATION_SERVICE_API_KEY: ${{ secrets.ZEN_GOOGLE_LOCATION_SERVICE_API_KEY }}
         run: |
           set -x
           dos2unix configs/windows/mozconfig
diff --git a/.llvm-version b/.llvm-version
new file mode 100644
index 000000000..8fdd954df
--- /dev/null
+++ b/.llvm-version
@@ -0,0 +1 @@
+22
\ No newline at end of file
diff --git a/configs/linux/mozconfig b/configs/linux/mozconfig
index 9816e7580..c959a8eec 100644
--- a/configs/linux/mozconfig
+++ b/configs/linux/mozconfig
@@ -2,15 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# Setting the compiler based on the existence of clang bin directory
-if test -d "$HOME/.mozbuild/clang/bin"; then
-    export CC="$HOME/.mozbuild/clang/bin/clang"
-    export CXX="$HOME/.mozbuild/clang/bin/clang++"
-else
-    export CC=clang
-    export CXX=clang++
-fi
-
 if test "$ZEN_RELEASE"; then
     if test "$SURFER_COMPAT" = "x86_64"; then
         ac_add_options --target=x86_64-pc-linux