From 7192dc2c01a8ad8e8b0fd9a6bc2afdf7e2527c87 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 31 Oct 2020 15:54:01 +0000 Subject: firefox: fix build with clang > ERROR: --with-clang-path is not valid when the target compiler is clang --- nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixpkgs/pkgs/applications') 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 -- cgit 1.4.1