Merge pull request NixOS#332170 from ExpidusOS/fix/firefox-llvm-commo…

…n-opts llvmPackages: fix wasm with common opts
offsetcyan · Aug 4, 2024 · e16b22c · e16b22c
2 parents f099c76 + 0b07b7e
commit e16b22c
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
@@ -471,10 +471,12 @@ let
               && stdenv.targetPlatform.useLLVM or false
             ) "-lunwind"
             ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
-          nixSupport.cc-ldflags = lib.optionals (
-            !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD
-          ) [ "-L${targetLlvmLibraries.libunwind}/lib" ]
-            ++ lib.optional (lib.versionAtLeast metadata.release_version "17") "--undefined-version";
+          nixSupport.cc-ldflags =
+            lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD)
+              (
+                [ "-L${targetLlvmLibraries.libunwind}/lib" ]
+                ++ lib.optional (lib.versionAtLeast metadata.release_version "17") "--undefined-version"
+              );
         }
       );
 
@@ -695,13 +697,11 @@ let
           ./compiler-rt/armv6-scudo-no-yield.patch
           ./compiler-rt/armv6-scudo-libatomic.patch
         ]
-        ++ lib.optional (lib.versionAtLeast metadata.release_version "19") (
-          fetchpatch {
-            url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch";
-            hash = "sha256-JykABCaNNhYhZQxCvKiBn54DZ5ZguksgCHnpdwWF2no=";
-            relative = "compiler-rt";
-          }
-        );
+        ++ lib.optional (lib.versionAtLeast metadata.release_version "19") (fetchpatch {
+          url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch";
+          hash = "sha256-JykABCaNNhYhZQxCvKiBn54DZ5ZguksgCHnpdwWF2no=";
+          relative = "compiler-rt";
+        });
     in
     {
       compiler-rt-libc = callPackage ./compiler-rt (