Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging

2021-04-12 18:49:01 +00:00
parent 82ca81cd62 60daed5714
commit 08b22e605b
377 changed files with 13801 additions and 5789 deletions
@@ -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
    ''