Partial revert

ci/test/04_install.sh

@@ -48,7 +48,7 @@ else
 fi
 
 DOCKER_EXEC () {
-  $DOCKER_CI_CMD_PREFIX bash -c "export PATH=$BASE_SCRATCH_DIR/bins/:$DEPENDS_DIR/$HOST/native/bin:\$PATH && cd $P_CI_DIR && $*"
+  $DOCKER_CI_CMD_PREFIX bash -c "export PATH=$BASE_SCRATCH_DIR/bins/:\$PATH && cd $P_CI_DIR && $*"
 }
 export -f DOCKER_EXEC
 

depends/Makefile

@@ -173,15 +173,21 @@ $(host_prefix)/.stamp_$(final_build_id): $(native_packages) $(packages)
 	$(AT)cd $(@D); $(foreach package,$^, tar xf $($(package)_cached); )
 	$(AT)touch $@
 
+binutils_prefixbin=$($($(host_arch)_$(host_os)_native_binutils)_prefixbin)
+toolchain_prefixbin=$($($(host_arch)_$(host_os)_native_toolchain)_prefixbin)
+
+binutils_path=$(if $(binutils_prefixbin),$(binutils_prefixbin):)$(PATH)
+toolchain_path=$(if $(toolchain_prefixbin),$(toolchain_prefixbin):)$(PATH)
+
 $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_build_id)
 	$(AT)@mkdir -p $(@D)
 	$(AT)sed -e 's|@HOST@|$(host)|' \
-            -e 's|@CC@|$(host_CC)|' \
-            -e 's|@CXX@|$(host_CXX)|' \
-            -e 's|@AR@|$(host_AR)|' \
-            -e 's|@RANLIB@|$(host_RANLIB)|' \
-            -e 's|@NM@|$(host_NM)|' \
-            -e 's|@STRIP@|$(host_STRIP)|' \
+            -e "s|@CC@|env PATH='$(toolchain_path)' $(host_CC)|" \
+            -e "s|@CXX@|env PATH='$(toolchain_path)' $(host_CXX)|" \
+            -e "s|@AR@|env PATH='$(binutils_path)' $(host_AR)|" \
+            -e "s|@RANLIB@|env PATH='$(binutils_path)' $(host_RANLIB)|" \
+            -e "s|@NM@|env PATH='$(binutils_path)' $(host_NM)|" \
+            -e "s|@STRIP@|env PATH='$(binutils_path)' $(host_STRIP)|" \
             -e 's|@build_os@|$(build_os)|' \
             -e 's|@host_os@|$(host_os)|' \
             -e 's|@CFLAGS@|$(strip $(host_CFLAGS) $(host_$(release_type)_CFLAGS))|' \