diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-30 15:38:33 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-31 13:54:07 -0400 |
commit | 46fd4bcb1469434163d8f873ee57f761009008e8 (patch) | |
tree | 5f7bde7f323d1e21561a8b2582dec620bfd98814 /pkgs/build-support | |
parent | 095af3e63b26e4984c95de7d8a495503e6bfa605 (diff) | |
download | nixlib-46fd4bcb1469434163d8f873ee57f761009008e8.tar nixlib-46fd4bcb1469434163d8f873ee57f761009008e8.tar.gz nixlib-46fd4bcb1469434163d8f873ee57f761009008e8.tar.bz2 nixlib-46fd4bcb1469434163d8f873ee57f761009008e8.tar.lz nixlib-46fd4bcb1469434163d8f873ee57f761009008e8.tar.xz nixlib-46fd4bcb1469434163d8f873ee57f761009008e8.tar.zst nixlib-46fd4bcb1469434163d8f873ee57f761009008e8.zip |
cc-wrapper: Remove {START,EXEC}_HOOK
These are no longer used by anything
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/cc-wrapper/add-flags.sh | 5 | ||||
-rw-r--r-- | pkgs/build-support/cc-wrapper/cc-wrapper.sh | 8 | ||||
-rw-r--r-- | pkgs/build-support/cc-wrapper/gnat-wrapper.sh | 8 | ||||
-rw-r--r-- | pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh | 4 | ||||
-rw-r--r-- | pkgs/build-support/cc-wrapper/ld-wrapper.sh | 8 |
5 files changed, 0 insertions, 33 deletions
diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 4d28ba08d103..4f5946a887eb 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 6099535600c7..aacaf196f313 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 1a09f4841098..f0c922a3d5b4 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 ee973d3270f9..2de748b5f31e 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 38712665e432..ce0b0143fb00 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@ \ |