diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-31 13:54:32 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-31 13:54:32 -0400 |
| commit | 3d3a6e0fac471e479a0ab91f3088a327292e4dc7 (patch) | |
| tree | dab95447a232aec58c11fd14739501956cbde2e3 | |
| parent | 46fd4bcb1469434163d8f873ee57f761009008e8 (diff) | |
| download | nixlib-3d3a6e0fac471e479a0ab91f3088a327292e4dc7.tar nixlib-3d3a6e0fac471e479a0ab91f3088a327292e4dc7.tar.gz nixlib-3d3a6e0fac471e479a0ab91f3088a327292e4dc7.tar.bz2 nixlib-3d3a6e0fac471e479a0ab91f3088a327292e4dc7.tar.lz nixlib-3d3a6e0fac471e479a0ab91f3088a327292e4dc7.tar.xz nixlib-3d3a6e0fac471e479a0ab91f3088a327292e4dc7.tar.zst nixlib-3d3a6e0fac471e479a0ab91f3088a327292e4dc7.zip | |
cc-wrapper: Remove support for NIX_LDFLAGS_HARDEN
It has long been deprecated
| -rw-r--r-- | pkgs/build-support/cc-wrapper/add-flags.sh | 1 | ||||
| -rw-r--r-- | pkgs/build-support/cc-wrapper/ld-wrapper.sh | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 4f5946a887eb..39633fce69a8 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -14,7 +14,6 @@ var_templates=( NIX+LDFLAGS NIX+LDFLAGS_BEFORE NIX+LDFLAGS_AFTER - NIX+LDFLAGS_HARDEN NIX+SET_BUILD_ID NIX+DONT_SET_RPATH diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh index ce0b0143fb00..a9cc1e3f9e6f 100644 --- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh @@ -61,7 +61,7 @@ if [ -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ]; then extraBefore+=($NIX_@infixSalt@_LDFLAGS_BEFORE) fi -extraAfter+=($NIX_@infixSalt@_LDFLAGS_AFTER $NIX_@infixSalt@_LDFLAGS_HARDEN) +extraAfter+=($NIX_@infixSalt@_LDFLAGS_AFTER) declare -a libDirs declare -A libs |