spidermonkey: use the same LLVM as rustc

Spidermonkey depends on rustc, so we have the best chance at only having a single LLVM in the build closure if we use the same LLVM that rustc depends on.
2022-03-22 20:40:54 +00:00
parent 07b832716c
commit 3ff5f0eb76
2 changed files with 2 additions and 4 deletions
@@ -15,7 +15,6 @@
 , rustc
 , rust-cbindgen
 , yasm
-, llvmPackages_12
 , nspr
 }:

@@ -52,7 +51,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [
    autoconf213
    cargo
-    llvmPackages_12.llvm # for llvm-objdump
+    rustc.llvmPackages.llvm # for llvm-objdump
    perl
    pkg-config
    python3
@@ -13,7 +13,6 @@
 , rustc
 , rust-cbindgen
 , yasm
-, llvmPackages_latest
 , nspr
 , m4
 }:
@@ -32,7 +31,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [
    cargo
-    llvmPackages_latest.llvm # for llvm-objdump
+    rustc.llvmPackages.llvm # for llvm-objdump
    perl
    pkg-config
    python3