diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-04 22:11:37 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-03-04 22:11:37 +0100 |
| commit | a992d6867108fa317f461becc92a7f36a59bac61 (patch) | |
| tree | e6f50286c73fe41d3d91a7cb16e3b0a7d772e527 /pkgs/build-support/cc-wrapper | |
| parent | 030d3a188c53892e9940da1f4a86681bc124d609 (diff) | |
| parent | 98207d2573f47d37cb33cb73375c4a720007d3e0 (diff) | |
| download | nixpkgs-a992d6867108fa317f461becc92a7f36a59bac61.tar nixpkgs-a992d6867108fa317f461becc92a7f36a59bac61.tar.gz nixpkgs-a992d6867108fa317f461becc92a7f36a59bac61.tar.bz2 nixpkgs-a992d6867108fa317f461becc92a7f36a59bac61.tar.lz nixpkgs-a992d6867108fa317f461becc92a7f36a59bac61.tar.xz nixpkgs-a992d6867108fa317f461becc92a7f36a59bac61.tar.zst nixpkgs-a992d6867108fa317f461becc92a7f36a59bac61.zip | |
Merge branch 'master' into staging-next
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 c8af8789fcc..65f9791597e 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 '' |