From 416e1545989a514fd657cf51d362c01b9478e725 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 15 Apr 2022 16:22:01 +0200
Subject: [PATCH] merge bitcoin#24866: No longer need to hack the PATH variable
 in `config.site`

includes:
- f3af4f7a182f81269c193d5d1fd0effb9161f7c6
- efa3a807a677659b0b74cdeda944e7c8ce0157fb

continuation of 9e0b9356 from dash#6384
---
 depends/Makefile            | 1 +
 depends/builders/darwin.mk  | 2 ++
 depends/builders/default.mk | 2 +-
 depends/config.site.in      | 6 +++++-
 depends/hosts/darwin.mk     | 2 +-
 depends/hosts/default.mk    | 2 +-
 6 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/depends/Makefile b/depends/Makefile
index b13e07b6f8b56..cc9a249b9e896 100644
--- a/depends/Makefile
+++ b/depends/Makefile
@@ -227,6 +227,7 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_
             -e 's|@NM@|$(host_NM)|' \
             -e 's|@STRIP@|$(host_STRIP)|' \
             -e 's|@OBJDUMP@|$(host_OBJDUMP)|' \
+            -e 's|@DSYMUTIL@|$(host_DSYMUTIL)|' \
             -e 's|@build_os@|$(build_os)|' \
             -e 's|@host_os@|$(host_os)|' \
             -e 's|@CFLAGS@|$(strip $(host_CFLAGS) $(host_$(release_type)_CFLAGS))|' \
diff --git a/depends/builders/darwin.mk b/depends/builders/darwin.mk
index 3aea314ad87c3..be04e1d8f3fc8 100644
--- a/depends/builders/darwin.mk
+++ b/depends/builders/darwin.mk
@@ -5,6 +5,7 @@ build_darwin_RANLIB:=$(shell xcrun -f ranlib)
 build_darwin_STRIP:=$(shell xcrun -f strip)
 build_darwin_OBJDUMP:=$(shell xcrun -f objdump)
 build_darwin_NM:=$(shell xcrun -f nm)
+build_darwin_DSYMUTIL:=$(shell xcrun -f dsymutil)
 build_darwin_SHA256SUM=shasum -a 256
 build_darwin_DOWNLOAD=curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o
 
@@ -16,6 +17,7 @@ darwin_RANLIB:=$(shell xcrun -f ranlib)
 darwin_STRIP:=$(shell xcrun -f strip)
 darwin_OBJDUMP:=$(shell xcrun -f objdump)
 darwin_NM:=$(shell xcrun -f nm)
+darwin_DSYMUTIL:=$(shell xcrun -f dsymutil)
 darwin_native_binutils=
 darwin_native_toolchain=
 
diff --git a/depends/builders/default.mk b/depends/builders/default.mk
index fa7dfbb005303..2a1709d98ad21 100644
--- a/depends/builders/default.mk
+++ b/depends/builders/default.mk
@@ -13,7 +13,7 @@ build_$(build_os)_$1 ?= $$(default_build_$1)
 build_$(build_arch)_$(build_os)_$1 ?= $$(build_$(build_os)_$1)
 build_$1=$$(build_$(build_arch)_$(build_os)_$1)
 endef
-$(foreach var,CC CXX AR TAR RANLIB NM STRIP SHA256SUM DOWNLOAD OBJDUMP TOUCH,$(eval $(call add_build_tool_func,$(var))))
+$(foreach var,CC CXX AR TAR RANLIB NM STRIP SHA256SUM DOWNLOAD OBJDUMP DSYMUTIL TOUCH,$(eval $(call add_build_tool_func,$(var))))
 define add_build_flags_func
 build_$(build_arch)_$(build_os)_$1 += $(build_$(build_os)_$1)
 build_$1=$$(build_$(build_arch)_$(build_os)_$1)
diff --git a/depends/config.site.in b/depends/config.site.in
index 1df388666ee25..9fb9da29851cd 100644
--- a/depends/config.site.in
+++ b/depends/config.site.in
@@ -78,7 +78,6 @@ if test "@host_os@" = darwin; then
   BREW=no
 fi
 
-PATH="${depends_prefix}/native/bin:${PATH}"
 PKG_CONFIG="$(which pkg-config) --static"
 
 # These two need to remain exported because pkg-config does not see them
@@ -125,6 +124,11 @@ if test "@host_os@" = darwin; then
     OBJDUMP="@OBJDUMP@"
     ac_cv_path_ac_pt_OBJDUMP="${OBJDUMP}"
   fi
+
+  if test -n "@DSYMUTIL@"; then
+    DSYMUTIL="@DSYMUTIL@"
+    ac_cv_path_ac_pt_DSYMUTIL="${DSYMUTIL}"
+  fi
 fi
 
 if test -n "@debug@"; then
diff --git a/depends/hosts/darwin.mk b/depends/hosts/darwin.mk
index a683a9bc34163..2c4ef0644d2c5 100644
--- a/depends/hosts/darwin.mk
+++ b/depends/hosts/darwin.mk
@@ -43,7 +43,7 @@ llvm_lib_dir=$(shell $(llvm_config_prog) --libdir)
 darwin_OBJDUMP=$(shell $(SHELL) $(.SHELLFLAGS) "command -v llvm-objdump")
 endif
 
-cctools_TOOLS=AR RANLIB STRIP NM
+cctools_TOOLS=AR RANLIB STRIP NM DSYMUTIL
 
 # Make-only lowercase function
 lc = $(subst A,a,$(subst B,b,$(subst C,c,$(subst D,d,$(subst E,e,$(subst F,f,$(subst G,g,$(subst H,h,$(subst I,i,$(subst J,j,$(subst K,k,$(subst L,l,$(subst M,m,$(subst N,n,$(subst O,o,$(subst P,p,$(subst Q,q,$(subst R,r,$(subst S,s,$(subst T,t,$(subst U,u,$(subst V,v,$(subst W,w,$(subst X,x,$(subst Y,y,$(subst Z,z,$1))))))))))))))))))))))))))
diff --git a/depends/hosts/default.mk b/depends/hosts/default.mk
index c9ee7cc950127..d82c33f29ce06 100644
--- a/depends/hosts/default.mk
+++ b/depends/hosts/default.mk
@@ -38,5 +38,5 @@ host_$1 = $$($(host_arch)_$(host_os)_$1)
 host_$(release_type)_$1 = $$($(host_arch)_$(host_os)_$(release_type)_$1)
 endef
 
-$(foreach tool,CC CXX AR RANLIB STRIP NM OBJCOPY OBJDUMP,$(eval $(call add_host_tool_func,$(tool))))
+$(foreach tool,CC CXX AR RANLIB STRIP NM OBJCOPY OBJDUMP DSYMUTIL,$(eval $(call add_host_tool_func,$(tool))))
 $(foreach flags,CFLAGS CXXFLAGS CPPFLAGS LDFLAGS, $(eval $(call add_host_flags_func,$(flags))))