diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-06 18:35:56 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-08 17:16:15 -0400 |
| commit | 044a73bbe68673136b654bc99f412ac116f11ca3 (patch) | |
| tree | e8feec4f472c753d6ae240d592fcc39f31c25e75 /pkgs/build-support/bintools-wrapper | |
| parent | 1dc0404d6efb27407ce7716a14610b5f9bbf115a (diff) | |
| download | nixpkgs-044a73bbe68673136b654bc99f412ac116f11ca3.tar nixpkgs-044a73bbe68673136b654bc99f412ac116f11ca3.tar.gz nixpkgs-044a73bbe68673136b654bc99f412ac116f11ca3.tar.bz2 nixpkgs-044a73bbe68673136b654bc99f412ac116f11ca3.tar.lz nixpkgs-044a73bbe68673136b654bc99f412ac116f11ca3.tar.xz nixpkgs-044a73bbe68673136b654bc99f412ac116f11ca3.tar.zst nixpkgs-044a73bbe68673136b654bc99f412ac116f11ca3.zip | |
bintools-wrapper: Define env vars with full path
Diffstat (limited to 'pkgs/build-support/bintools-wrapper')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/setup-hook.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh index f65b792485a..2cf606cce7c 100644 --- a/pkgs/build-support/bintools-wrapper/setup-hook.sh +++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh @@ -59,11 +59,11 @@ for cmd in \ ar as ld nm objcopy objdump readelf ranlib strip strings size windres do if - PATH=$_PATH type -p "@targetPrefix@${cmd}" > /dev/null + cmd_path=$(PATH=$_PATH command -v "@targetPrefix@${cmd}") then upper_case="$(echo "$cmd" | tr "[:lower:]" "[:upper:]")" - export "${role_pre}${upper_case}=@targetPrefix@${cmd}"; - export "${upper_case}${role_post}=@targetPrefix@${cmd}"; + export "${role_pre}${upper_case}=${cmd_path}"; + export "${upper_case}${role_post}=${cmd_path}"; fi done @@ -72,5 +72,5 @@ done export NIX_HARDENING_ENABLE # No local scope in sourced file -unset -v role_pre role_post cmd upper_case +unset -v role_pre role_post cmd cmd_path upper_case set +u |