diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-04 22:16:45 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-03-04 22:16:45 +0100 |
| commit | 6d1958ad2dda67aa4f667d2283781949c8d18303 (patch) | |
| tree | 56cb000fe8a66aaa690a61dae410a86bebde2b56 /pkgs/build-support/cc-wrapper | |
| parent | 9f7ce23482602164afe4f0a339f20879bf7df6cc (diff) | |
| parent | a992d6867108fa317f461becc92a7f36a59bac61 (diff) | |
| download | nixpkgs-6d1958ad2dda67aa4f667d2283781949c8d18303.tar nixpkgs-6d1958ad2dda67aa4f667d2283781949c8d18303.tar.gz nixpkgs-6d1958ad2dda67aa4f667d2283781949c8d18303.tar.bz2 nixpkgs-6d1958ad2dda67aa4f667d2283781949c8d18303.tar.lz nixpkgs-6d1958ad2dda67aa4f667d2283781949c8d18303.tar.xz nixpkgs-6d1958ad2dda67aa4f667d2283781949c8d18303.tar.zst nixpkgs-6d1958ad2dda67aa4f667d2283781949c8d18303.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 06e43b6ea5f..8f20abc560a 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -298,7 +298,10 @@ stdenv.mkDerivation { # vs libstdc++, etc.) since Darwin isn't `useLLVM` on all counts. (See # https://clang.llvm.org/docs/Toolchain.html for all the axes one might # break `useLLVM` into.) - + optionalString (isClang && gccForLibs != null && targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' + + optionalString (isClang && gccForLibs != null + && targetPlatform.isLinux + && !(stdenv.targetPlatform.useAndroidPrebuilt or false) + && !(stdenv.targetPlatform.useLLVM or false)) '' echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags '' |