Revert "Merge pull request #44767 from obsidiansystems/wrapper-env-var-path"

This reverts commit 89efc27f571368b475ce87e71445be10a9d1121a, reversing
changes made to d0f11020ca55dfe20ecad05005343e3a3e3cbd90.

2 files changed, 8 insertions, 8 deletions

diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh
index 2cf606cce7c..f65b792485a 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
-        cmd_path=$(PATH=$_PATH command -v "@targetPrefix@${cmd}")
+        PATH=$_PATH type -p "@targetPrefix@${cmd}" > /dev/null
     then
         upper_case="$(echo "$cmd" | tr "[:lower:]" "[:upper:]")"
-        export "${role_pre}${upper_case}=${cmd_path}";
-        export "${upper_case}${role_post}=${cmd_path}";
+        export "${role_pre}${upper_case}=@targetPrefix@${cmd}";
+        export "${upper_case}${role_post}=@targetPrefix@${cmd}";
     fi
 done
 
@@ -72,5 +72,5 @@ done
 export NIX_HARDENING_ENABLE
 
 # No local scope in sourced file
-unset -v role_pre role_post cmd cmd_path upper_case
+unset -v role_pre role_post cmd upper_case
 set +u
diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh
index 619e75a3974..28060de7411 100644
--- a/pkgs/build-support/cc-wrapper/setup-hook.sh
+++ b/pkgs/build-support/cc-wrapper/setup-hook.sh
@@ -109,10 +109,10 @@ fi
 
 export NIX_${role_pre}CC=@out@
 
-export ${role_pre}CC=@out@/bin/@named_cc@
-export ${role_pre}CXX=@out@/bin/@named_cxx@
-export CC${role_post}=@out@/bin/@named_cc@
-export CXX${role_post}=@out@/bin/@named_cxx@
+export ${role_pre}CC=@named_cc@
+export ${role_pre}CXX=@named_cxx@
+export CC${role_post}=@named_cc@
+export CXX${role_post}=@named_cxx@
 
 # If unset, assume the default hardening flags.
 : ${NIX_HARDENING_ENABLE="fortify stackprotector pic strictoverflow format relro bindnow"}