diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-20 18:45:52 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-24 15:49:32 -0500 |
| commit | 071030840252273acf05c9902458d4db5bdd71ab (patch) | |
| tree | 6de26d921db33419ae2b783fdc56d79e80a2867a /pkgs/top-level | |
| parent | a7a61998e9a5da33c7540486cc0616271f5e5f73 (diff) | |
| download | nixlib-071030840252273acf05c9902458d4db5bdd71ab.tar nixlib-071030840252273acf05c9902458d4db5bdd71ab.tar.gz nixlib-071030840252273acf05c9902458d4db5bdd71ab.tar.bz2 nixlib-071030840252273acf05c9902458d4db5bdd71ab.tar.lz nixlib-071030840252273acf05c9902458d4db5bdd71ab.tar.xz nixlib-071030840252273acf05c9902458d4db5bdd71ab.tar.zst nixlib-071030840252273acf05c9902458d4db5bdd71ab.zip | |
clang, cc-wrapper: Move `--gcc-toolchain` logic into CC wrapper
Take 2, after #94582 had to be reverted. This reverts commit ac03cfa3c57027e82073ea7db71248d4ab78af66.
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 343531f71f22..8e1c18731934 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 ''; }; |