diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-10-31 15:54:01 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-11-27 13:29:12 +0000 |
| commit | 7192dc2c01a8ad8e8b0fd9a6bc2afdf7e2527c87 (patch) | |
| tree | fe65239bb3941266817abb04ad556d61c78a986e /nixpkgs/pkgs/applications | |
| parent | 21c0d54daca2169d78e44e83bf1e9f80513167da (diff) | |
| download | nixlib-7192dc2c01a8ad8e8b0fd9a6bc2afdf7e2527c87.tar nixlib-7192dc2c01a8ad8e8b0fd9a6bc2afdf7e2527c87.tar.gz nixlib-7192dc2c01a8ad8e8b0fd9a6bc2afdf7e2527c87.tar.bz2 nixlib-7192dc2c01a8ad8e8b0fd9a6bc2afdf7e2527c87.tar.lz nixlib-7192dc2c01a8ad8e8b0fd9a6bc2afdf7e2527c87.tar.xz nixlib-7192dc2c01a8ad8e8b0fd9a6bc2afdf7e2527c87.tar.zst nixlib-7192dc2c01a8ad8e8b0fd9a6bc2afdf7e2527c87.zip | |
firefox: fix build with clang
> ERROR: --with-clang-path is not valid when the target compiler is clang
Diffstat (limited to 'nixpkgs/pkgs/applications')
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index a5c92cafee54..f4e2e067a01b 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -263,7 +263,7 @@ buildStdenv.mkDerivation ({ "--with-system-nss" ] ++ lib.optional (buildStdenv.isDarwin) "--disable-xcode-checks" - ++ lib.optional (!ltoSupport) "--with-clang-path=${llvmPackages.clang}/bin/clang" + ++ lib.optional (!ltoSupport && !stdenv.cc.isClang) "--with-clang-path=${llvmPackages.clang}/bin/clang" # LTO is done using clang and lld on Linux. # Darwin needs to use the default linker as lld is not supported (yet?): # https://bugzilla.mozilla.org/show_bug.cgi?id=1538724 |