public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #123886 from sternenseemann/firefox-llvm-bintools

Browse Source 
[staging-next] firefox: take LLVM tools from buildStdenv
This commit is contained in:
Bernardo Meurer 2021-05-21 16:53:10 -07:00 committed by GitHub
commit 0841bba38a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/networking/browsers/firefox/common.nix
View File

@ -327,11 +327,11 @@ buildStdenv.mkDerivation ({
"BUILD_OFFICIAL=1" "BUILD_OFFICIAL=1"
] ]
++ lib.optionals ltoSupport [ ++ lib.optionals ltoSupport [
"AR=${llvmPackages.bintools}/bin/llvm-ar" "AR=${buildStdenv.cc.bintools.bintools}/bin/llvm-ar"
"LLVM_OBJDUMP=${llvmPackages.bintools}/bin/llvm-objdump" "LLVM_OBJDUMP=${buildStdenv.cc.bintools.bintools}/bin/llvm-objdump"
"NM=${llvmPackages.bintools}/bin/llvm-nm" "NM=${buildStdenv.cc.bintools.bintools}/bin/llvm-nm"
"RANLIB=${llvmPackages.bintools}/bin/llvm-ranlib" "RANLIB=${buildStdenv.cc.bintools.bintools}/bin/llvm-ranlib"
"STRIP=${llvmPackages.bintools}/bin/llvm-strip" "STRIP=${buildStdenv.cc.bintools.bintools}/bin/llvm-strip"
] ]
++ extraMakeFlags; ++ extraMakeFlags;