From 46fd4bcb1469434163d8f873ee57f761009008e8 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 30 Aug 2017 15:38:33 -0400 Subject: [PATCH 1/2] cc-wrapper: Remove {START,EXEC}_HOOK These are no longer used by anything --- pkgs/build-support/cc-wrapper/add-flags.sh | 5 ----- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 8 -------- pkgs/build-support/cc-wrapper/gnat-wrapper.sh | 8 -------- pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh | 4 ---- pkgs/build-support/cc-wrapper/ld-wrapper.sh | 8 -------- 5 files changed, 33 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 4d28ba08d10..4f5946a887e 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -5,11 +5,6 @@ # wrapped binary just inherit the work of the forker's wrapper script. var_templates=( - NIX_CC_WRAPPER+START_HOOK - NIX_CC_WRAPPER+EXEC_HOOK - NIX_LD_WRAPPER+START_HOOK - NIX_LD_WRAPPER+EXEC_HOOK - NIX+CFLAGS_COMPILE NIX+CFLAGS_LINK NIX+CXXSTDLIB_COMPILE diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 6099535600c..aacaf196f31 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -15,10 +15,6 @@ if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then source @out@/nix-support/add-flags.sh fi -if [ -n "$NIX_CC_WRAPPER_@infixSalt@_START_HOOK" ]; then - source "$NIX_CC_WRAPPER_@infixSalt@_START_HOOK" -fi - source @out@/nix-support/utils.sh @@ -175,10 +171,6 @@ if [ -n "${NIX_DEBUG:-}" ]; then printf " %q\n" ${extraAfter+"${extraAfter[@]}"} >&2 fi -if [ -n "$NIX_CC_WRAPPER_@infixSalt@_EXEC_HOOK" ]; then - source "$NIX_CC_WRAPPER_@infixSalt@_EXEC_HOOK" -fi - PATH="$path_backup" # Old bash workaround, see above. exec @prog@ \ diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh index 1a09f484109..f0c922a3d5b 100644 --- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh @@ -17,10 +17,6 @@ if [ -z "${NIX_@infixSalt@_GNAT_WRAPPER_FLAGS_SET:-}" ]; then source @out@/nix-support/add-flags.sh fi -if [ -n "$NIX_@infixSalt@_GNAT_WRAPPER_START_HOOK" ]; then - source "$NIX_@infixSalt@_GNAT_WRAPPER_START_HOOK" -fi - source @out@/nix-support/utils.sh @@ -122,9 +118,5 @@ if [ -n "${NIX_DEBUG:-}" ]; then printf " %q\n" "${extraAfter[@]}" >&2 fi -if [ -n "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK" ]; then - source "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK" -fi - PATH="$path_backup" exec @prog@ "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}" diff --git a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh index ee973d3270f..2de748b5f31 100644 --- a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh @@ -33,8 +33,4 @@ if [ -n "${NIX_DEBUG:-}" ]; then printf " %q\n" "${extraAfter[@]}" >&2 fi -if [ -n "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK" ]; then - source "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK" -fi - exec @prog@ "${extraBefore[@]}" "$@" "${extraAfter[@]}" diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh index 38712665e43..ce0b0143fb0 100644 --- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh @@ -14,10 +14,6 @@ if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then source @out@/nix-support/add-flags.sh fi -if [ -n "$NIX_LD_WRAPPER_@infixSalt@_START_HOOK" ]; then - source "$NIX_LD_WRAPPER_@infixSalt@_START_HOOK" -fi - source @out@/nix-support/utils.sh @@ -170,10 +166,6 @@ if [ -n "${NIX_DEBUG:-}" ]; then printf " %q\n" ${extraAfter+"${extraAfter[@]}"} >&2 fi -if [ -n "$NIX_LD_WRAPPER_@infixSalt@_EXEC_HOOK" ]; then - source "$NIX_LD_WRAPPER_@infixSalt@_EXEC_HOOK" -fi - PATH="$path_backup" # Old bash workaround, see above. exec @prog@ \ From 3d3a6e0fac471e479a0ab91f3088a327292e4dc7 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 31 Aug 2017 13:54:32 -0400 Subject: [PATCH 2/2] cc-wrapper: Remove support for NIX_LDFLAGS_HARDEN It has long been deprecated --- pkgs/build-support/cc-wrapper/add-flags.sh | 1 - pkgs/build-support/cc-wrapper/ld-wrapper.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 4f5946a887e..39633fce69a 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 ce0b0143fb0..a9cc1e3f9e6 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