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

Take 2, after #94582 had to be reverted.

This reverts commit ac03cfa3c5.
This commit is contained in:
John Ericson
2021-01-24 15:49:32 -05:00
parent a7a61998e9
commit 0710308402
11 changed files with 21 additions and 23 deletions
@@ -17,7 +17,6 @@ in rec {
mkdir "$rsrc"
ln -s "${cc}/lib/clang/$clang_version/include" "$rsrc"
echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
echo "--gcc-toolchain=${stdenv.cc.cc}" >> $out/nix-support/cc-cflags
echo "-Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
rm $out/nix-support/add-hardening.sh
touch $out/nix-support/add-hardening.sh