pyrox.dev
Merge pull request #123886 from sternenseemann/firefox-llvm-bintools
[staging-next] firefox: take LLVM tools from buildStdenv
authored by Bernardo Meurer and committed by GitHub 0841bba3 5efa447c
+5
-5
pkgs/applications/networking/browsers/firefox/common.nix
+5
-5
pkgs/applications/networking/browsers/firefox/common.nix
···
327
327
"BUILD_OFFICIAL=1"
328
328
]
329
329
++ lib.optionals ltoSupport [
330
-
"AR=${llvmPackages.bintools}/bin/llvm-ar"
331
-
"LLVM_OBJDUMP=${llvmPackages.bintools}/bin/llvm-objdump"
332
-
"NM=${llvmPackages.bintools}/bin/llvm-nm"
333
-
"RANLIB=${llvmPackages.bintools}/bin/llvm-ranlib"
334
-
"STRIP=${llvmPackages.bintools}/bin/llvm-strip"
330
+
"AR=${buildStdenv.cc.bintools.bintools}/bin/llvm-ar"
331
+
"LLVM_OBJDUMP=${buildStdenv.cc.bintools.bintools}/bin/llvm-objdump"
332
+
"NM=${buildStdenv.cc.bintools.bintools}/bin/llvm-nm"
333
+
"RANLIB=${buildStdenv.cc.bintools.bintools}/bin/llvm-ranlib"
334
+
"STRIP=${buildStdenv.cc.bintools.bintools}/bin/llvm-strip"
335
335
]
336
336
++ extraMakeFlags;
337
337