public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #28770 from obsidiansystems/remove-wrapper-hooks

Browse Source 
cc-wrapper: Remove deprecated parameters
This commit is contained in:
John Ericson 2017-08-31 20:03:57 -04:00 committed by GitHub
commit 46d6fecf78
5 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/build-support/cc-wrapper/add-flags.sh
View File

@ -5,11 +5,6 @@
# wrapped binary just inherit the work of the forker's wrapper script. # wrapped binary just inherit the work of the forker's wrapper script.
var_templates=( 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_COMPILE
NIX+CFLAGS_LINK NIX+CFLAGS_LINK
NIX+CXXSTDLIB_COMPILE NIX+CXXSTDLIB_COMPILE
@ -19,7 +14,6 @@ var_templates=(
NIX+LDFLAGS NIX+LDFLAGS
NIX+LDFLAGS_BEFORE NIX+LDFLAGS_BEFORE
NIX+LDFLAGS_AFTER NIX+LDFLAGS_AFTER
NIX+LDFLAGS_HARDEN
NIX+SET_BUILD_ID NIX+SET_BUILD_ID
NIX+DONT_SET_RPATH NIX+DONT_SET_RPATH

8
pkgs/build-support/cc-wrapper/cc-wrapper.sh
View File

@ -15,10 +15,6 @@ if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then
source @out@/nix-support/add-flags.sh source @out@/nix-support/add-flags.sh
fi fi
if [ -n "$NIX_CC_WRAPPER_@infixSalt@_START_HOOK" ]; then
source "$NIX_CC_WRAPPER_@infixSalt@_START_HOOK"
fi
source @out@/nix-support/utils.sh source @out@/nix-support/utils.sh
@ -175,10 +171,6 @@ if [ -n "${NIX_DEBUG:-}" ]; then
printf " %q\n" ${extraAfter+"${extraAfter[@]}"} >&2 printf " %q\n" ${extraAfter+"${extraAfter[@]}"} >&2
fi fi
if [ -n "$NIX_CC_WRAPPER_@infixSalt@_EXEC_HOOK" ]; then
source "$NIX_CC_WRAPPER_@infixSalt@_EXEC_HOOK"
fi
PATH="$path_backup" PATH="$path_backup"
# Old bash workaround, see above. # Old bash workaround, see above.
exec @prog@ \ exec @prog@ \

8
pkgs/build-support/cc-wrapper/gnat-wrapper.sh
View File

@ -17,10 +17,6 @@ if [ -z "${NIX_@infixSalt@_GNAT_WRAPPER_FLAGS_SET:-}" ]; then
source @out@/nix-support/add-flags.sh source @out@/nix-support/add-flags.sh
fi fi
if [ -n "$NIX_@infixSalt@_GNAT_WRAPPER_START_HOOK" ]; then
source "$NIX_@infixSalt@_GNAT_WRAPPER_START_HOOK"
fi
source @out@/nix-support/utils.sh source @out@/nix-support/utils.sh
@ -122,9 +118,5 @@ if [ -n "${NIX_DEBUG:-}" ]; then
printf " %q\n" "${extraAfter[@]}" >&2 printf " %q\n" "${extraAfter[@]}" >&2
fi fi
if [ -n "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK" ]; then
source "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK"
fi
PATH="$path_backup" PATH="$path_backup"
exec @prog@ "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}" exec @prog@ "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}"

4
pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh
View File

@ -33,8 +33,4 @@ if [ -n "${NIX_DEBUG:-}" ]; then
printf " %q\n" "${extraAfter[@]}" >&2 printf " %q\n" "${extraAfter[@]}" >&2
fi fi
if [ -n "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK" ]; then
source "$NIX_@infixSalt@_GNAT_WRAPPER_EXEC_HOOK"
fi
exec @prog@ "${extraBefore[@]}" "$@" "${extraAfter[@]}" exec @prog@ "${extraBefore[@]}" "$@" "${extraAfter[@]}"

10
pkgs/build-support/cc-wrapper/ld-wrapper.sh
View File

@ -14,10 +14,6 @@ if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then
source @out@/nix-support/add-flags.sh source @out@/nix-support/add-flags.sh
fi fi
if [ -n "$NIX_LD_WRAPPER_@infixSalt@_START_HOOK" ]; then
source "$NIX_LD_WRAPPER_@infixSalt@_START_HOOK"
fi
source @out@/nix-support/utils.sh source @out@/nix-support/utils.sh
@ -65,7 +61,7 @@ if [ -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ]; then
extraBefore+=($NIX_@infixSalt@_LDFLAGS_BEFORE) extraBefore+=($NIX_@infixSalt@_LDFLAGS_BEFORE)
fi fi
extraAfter+=($NIX_@infixSalt@_LDFLAGS_AFTER $NIX_@infixSalt@_LDFLAGS_HARDEN) extraAfter+=($NIX_@infixSalt@_LDFLAGS_AFTER)
declare -a libDirs declare -a libDirs
declare -A libs declare -A libs
@ -170,10 +166,6 @@ if [ -n "${NIX_DEBUG:-}" ]; then
printf " %q\n" ${extraAfter+"${extraAfter[@]}"} >&2 printf " %q\n" ${extraAfter+"${extraAfter[@]}"} >&2
fi fi
if [ -n "$NIX_LD_WRAPPER_@infixSalt@_EXEC_HOOK" ]; then
source "$NIX_LD_WRAPPER_@infixSalt@_EXEC_HOOK"
fi
PATH="$path_backup" PATH="$path_backup"
# Old bash workaround, see above. # Old bash workaround, see above.
exec @prog@ \ exec @prog@ \