diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-07 11:04:19 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-07 11:09:25 -0400 |
| commit | 810fb0c9682053dcaa3eadfff4f52128f9cb5c4f (patch) | |
| tree | 824c1e285fbf1a547806ec4ce72e79a708c854ea /pkgs/build-support | |
| parent | 1271e5e0d49678ab7fa560647e547004a4f87e31 (diff) | |
| download | nixlib-810fb0c9682053dcaa3eadfff4f52128f9cb5c4f.tar nixlib-810fb0c9682053dcaa3eadfff4f52128f9cb5c4f.tar.gz nixlib-810fb0c9682053dcaa3eadfff4f52128f9cb5c4f.tar.bz2 nixlib-810fb0c9682053dcaa3eadfff4f52128f9cb5c4f.tar.lz nixlib-810fb0c9682053dcaa3eadfff4f52128f9cb5c4f.tar.xz nixlib-810fb0c9682053dcaa3eadfff4f52128f9cb5c4f.tar.zst nixlib-810fb0c9682053dcaa3eadfff4f52128f9cb5c4f.zip | |
cc-wrapper: Don't slurp `NIX_DONT_SET_RPATH` twice
Otherwise we end with a definition like `1 1`, which doesn't trigger the right conditional.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/add-flags.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index b3a765d38e38..3d01dba64766 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -58,7 +58,6 @@ for pre in "${role_prefixes[@]}"; do slurpUnsalted CFLAGS_LINK slurpUnsalted CXXSTDLIB_COMPILE slurpUnsalted CXXSTDLIB_LINK - slurpUnsalted DONT_SET_RPATH slurpUnsalted GNATFLAGS_COMPILE slurpUnsalted IGNORE_LD_THROUGH_GCC slurpUnsalted LDFLAGS |