clang, cc-wrapper: Move --gcc-toolchain logic into CC wrapper

Take 2, after #94582 had to be reverted. This reverts commit ac03cfa3c5.
2021-01-24 15:49:32 -05:00
parent a7a61998e9
commit 0710308402
11 changed files with 21 additions and 23 deletions
@@ -28,8 +28,6 @@ let
      ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
      ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share"
      echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-    '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
-      echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
    '';
  in {