diff options
| author | John Ericson <git@JohnEricson.me> | 2021-01-24 17:33:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-24 17:33:37 -0500 |
| commit | ebf40134f437952d6fb3f1907b4c5583b71bf792 (patch) | |
| tree | 744e7b3ec99a991d7807af0cdc4876d643985197 /pkgs/top-level | |
| parent | 8bcc8f63ac14e82e7cbdaef074d56db9d15cd103 (diff) | |
| parent | 071030840252273acf05c9902458d4db5bdd71ab (diff) | |
| download | nixlib-ebf40134f437952d6fb3f1907b4c5583b71bf792.tar nixlib-ebf40134f437952d6fb3f1907b4c5583b71bf792.tar.gz nixlib-ebf40134f437952d6fb3f1907b4c5583b71bf792.tar.bz2 nixlib-ebf40134f437952d6fb3f1907b4c5583b71bf792.tar.lz nixlib-ebf40134f437952d6fb3f1907b4c5583b71bf792.tar.xz nixlib-ebf40134f437952d6fb3f1907b4c5583b71bf792.tar.zst nixlib-ebf40134f437952d6fb3f1907b4c5583b71bf792.zip | |
Merge pull request #110251 from Ericson2314/gcc-toolchain-cleanup
clang, cc-wrapper: Move `--gcc-toolchain` logic into CC wrapper
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68a84f13d133..72697b4fd807 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9498,8 +9498,6 @@ in mkdir -p "$rsrc/lib" ln -s "${cc}/lib" "$rsrc/include" 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 ''; }; |