diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-08-17 16:12:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-17 16:12:26 -0400 |
| commit | 89efc27f571368b475ce87e71445be10a9d1121a (patch) | |
| tree | 4e15a2a140d55effe691a0f127175dd4f0ba986f /pkgs/build-support/bintools-wrapper | |
| parent | d0f11020ca55dfe20ecad05005343e3a3e3cbd90 (diff) | |
| parent | 30ea1bfd221277735e1e19ab916e96709759bd51 (diff) | |
Merge pull request #44767 from obsidiansystems/wrapper-env-var-path
{cc,bintools}-wrapper, ghc, libgcc: Define wrapper env vars as full paths
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 f65b792485a0..2cf606cce7c9 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 |