movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

firefox: remove unnecessary make flags and LD_FLAGS

Browse source 
Since we are using LLVM stdenv when enabling LTO, there are no need to
manually specify them.
This commit is contained in:
oxalica 2021-11-16 18:40:02 +08:00
parent 67a50ee79f
commit c2409db926
No known key found for this signature in database
GPG key ID: CED392DE0C483D00
1 changed files with 1 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pkgs/applications/networking/browsers/firefox/common.nix
View file

@ -174,10 +174,6 @@ buildStdenv.mkDerivation ({
AVFoundation MediaToolbox CoreLocation AVFoundation MediaToolbox CoreLocation
Foundation libobjc AddressBook cups ]; Foundation libobjc AddressBook cups ];
NIX_LDFLAGS = lib.optionalString ltoSupport ''
-rpath ${llvmPackages.libunwind.out}/lib
'';
MACH_USE_SYSTEM_PYTHON = "1"; MACH_USE_SYSTEM_PYTHON = "1";
postPatch = '' postPatch = ''
@ -297,14 +293,7 @@ buildStdenv.mkDerivation ({
cd obj-* cd obj-*
''; '';
makeFlags = lib.optionals ltoSupport [ makeFlags = extraMakeFlags;
"AR=${buildStdenv.cc.bintools.bintools}/bin/llvm-ar"
"LLVM_OBJDUMP=${buildStdenv.cc.bintools.bintools}/bin/llvm-objdump"
"NM=${buildStdenv.cc.bintools.bintools}/bin/llvm-nm"
"RANLIB=${buildStdenv.cc.bintools.bintools}/bin/llvm-ranlib"
"STRIP=${buildStdenv.cc.bintools.bintools}/bin/llvm-strip"
]
++ extraMakeFlags;
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = false; # "--disable-tests" above doCheck = false; # "--disable-tests" above