From 0ecdff6a06bbd30e40d3acc39f0fd4e98653222d Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 10 Jan 2026 18:55:51 +0000
Subject: [PATCH] llvmPackages.libllvm: clean up rebuild avoidance

---
 .../compilers/llvm/common/llvm/default.nix        | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix
index 4cab9595a10c..62a99c06edea 100644
--- a/pkgs/development/compilers/llvm/common/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/common/llvm/default.nix
@@ -303,17 +303,10 @@ stdenv.mkDerivation (
           # This was fixed upstream in LLVM 21 with
           # 88f041f3e05e26617856cc096d2e2864dfaa1c7b, but it’s too
           # painful to backport all the way.
-          lib.optionalString
-            (
-              lib.versionOlder release_version "21"
-              ||
-                # Rebuild avoidance; TODO: clean up on `staging`.
-                stdenv.hostPlatform.isx86
-            )
-            ''
-              substituteInPlace unittests/TargetParser/Host.cpp \
-                --replace-fail "getMacOSHostVersion" "DISABLED_getMacOSHostVersion"
-            ''
+          lib.optionalString (lib.versionOlder release_version "21") ''
+            substituteInPlace unittests/TargetParser/Host.cpp \
+              --replace-fail "getMacOSHostVersion" "DISABLED_getMacOSHostVersion"
+          ''
         +
           # This test fails with a `dysmutil` crash; have not yet dug into what's
           # going on here (TODO(@rrbutani)).