From c2409db926de4b7435e14e8366e8d08b0f69fd12 Mon Sep 17 00:00:00 2001 From: oxalica Date: Tue, 16 Nov 2021 18:40:02 +0800 Subject: [PATCH] firefox: remove unnecessary make flags and LD_FLAGS Since we are using LLVM stdenv when enabling LTO, there are no need to manually specify them. --- .../networking/browsers/firefox/common.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 1c0832e32ca2..99a71ab86a88 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -174,10 +174,6 @@ buildStdenv.mkDerivation ({ AVFoundation MediaToolbox CoreLocation Foundation libobjc AddressBook cups ]; - NIX_LDFLAGS = lib.optionalString ltoSupport '' - -rpath ${llvmPackages.libunwind.out}/lib - ''; - MACH_USE_SYSTEM_PYTHON = "1"; postPatch = '' @@ -297,14 +293,7 @@ buildStdenv.mkDerivation ({ cd obj-* ''; - makeFlags = lib.optionals ltoSupport [ - "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; + makeFlags = extraMakeFlags; enableParallelBuilding = true; doCheck = false; # "--disable-tests" above