diff options
| author | Luke Granger-Brown <git@lukegb.com> | 2021-04-12 18:26:33 +0000 |
|---|---|---|
| committer | Luke Granger-Brown <git@lukegb.com> | 2021-04-12 18:49:01 +0000 |
| commit | 08b22e605bc7d7560ef6ce567caa43f57178715f (patch) | |
| tree | eed46af25264ec81b18ba7a216beec55a84f6683 /pkgs/build-support/cc-wrapper | |
| parent | 82ca81cd62c785b81bf530837c05babcb9cde8a5 (diff) | |
| parent | 60daed57149403acbb622e48a003422eacea4c16 (diff) | |
Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index db751593701ed..14317cbe4cc57 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -312,10 +312,11 @@ 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 + + optionalString (isClang && targetPlatform.isLinux && !(stdenv.targetPlatform.useAndroidPrebuilt or false) - && !(stdenv.targetPlatform.useLLVM or false)) '' + && !(stdenv.targetPlatform.useLLVM or false) + && gccForLibs != null) '' echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags '' |