llvmPackages_12.libunwind: Make sure we get right llvm version

3 years ago · 4caedc060f
parent 894a09dfd2
commit 4caedc060f
1 changed files with 6 additions and 5 deletions
--- a/pkgs/development/compilers/llvm/12/default.nix
+++ b/pkgs/development/compilers/llvm/12/default.nix
@ -229,12 +229,13 @@ let
        libunwind = libraries.libunwind;
      }));

-    openmp = callPackage ./openmp { inherit llvm_meta; };
+    libunwind = callPackage ./libunwind ({
+      inherit (buildLlvmTools) llvm;
+    } // lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
+    });

-    libunwind = callPackage ./libunwind ({ inherit llvm_meta; } //
-      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
-        stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
-      }));
+    openmp = callPackage ./openmp { inherit llvm_meta; };

  });