llvmPackages: clean up rebuild avoidance

2025-09-30 08:25:32 -07:00
parent 3a4c1a332b
commit 957d7fea18
1 changed files with 8 additions and 12 deletions
@@ -374,18 +374,14 @@ let

      # This is an "oddly ordered" bootstrap just for Darwin. Probably
      # don't want it otherwise.
-      clangNoCompilerRtWithLibc =
-        wrapCCWith rec {
-          cc = tools.clang-unwrapped;
-          libcxx = null;
-          bintools = bintools';
-          extraPackages = [ ];
-          extraBuildCommands = mkExtraBuildCommands0 cc;
-        }
-        # FIXME: This should be inside the `wrapCCWith` call.
-        // lib.optionalAttrs stdenv.targetPlatform.isWasm {
-          nixSupport.cc-cflags = [ "-fno-exceptions" ];
-        };
+      clangNoCompilerRtWithLibc = wrapCCWith rec {
+        cc = tools.clang-unwrapped;
+        libcxx = null;
+        bintools = bintools';
+        extraPackages = [ ];
+        extraBuildCommands = mkExtraBuildCommands0 cc;
+        nixSupport.cc-cflags = lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
+      };

      # Aliases
      clangNoCompilerRt = tools.clangNoLibcNoRt;