From 407deabd75aedd5f2583f8f51222870cf60cebb5 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 18 Jul 2022 15:58:02 +0100
Subject: [PATCH] merge bitcoin#25612: default to using GCC tool wrappers for
 LTO (with GCC)

includes:
- 6fdc13c61f0e5ef6be0c03fa475741ab2cd57672

continuation of 019c9dd7 from dash#6384
---
 configure.ac           | 1 +
 depends/config.site.in | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index af682ac9c17c9..b536f7706eeeb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2014,5 +2014,6 @@ echo "  CPPFLAGS            = $DEBUG_CPPFLAGS $HARDENED_CPPFLAGS $CORE_CPPFLAGS
 echo "  CXX                 = $CXX"
 echo "  CXXFLAGS            = $DEBUG_CXXFLAGS $HARDENED_CXXFLAGS $WARN_CXXFLAGS $NOWARN_CXXFLAGS $ERROR_CXXFLAGS $GPROF_CXXFLAGS $CORE_CXXFLAGS $CXXFLAGS"
 echo "  LDFLAGS             = $PTHREAD_LIBS $HARDENED_LDFLAGS $GPROF_LDFLAGS $CORE_LDFLAGS $LDFLAGS"
+echo "  AR                  = $AR"
 echo "  ARFLAGS             = $ARFLAGS"
 echo
diff --git a/depends/config.site.in b/depends/config.site.in
index 9fb9da29851cd..2721a25171955 100644
--- a/depends/config.site.in
+++ b/depends/config.site.in
@@ -101,7 +101,7 @@ PYTHONPATH="${depends_prefix}/native/lib/python3/dist-packages${PYTHONPATH:+${PA
 
 if test -n "@AR@"; then
   AR="@AR@"
-  ac_cv_path_ac_pt_AR="${AR}"
+  ac_cv_path_AR="${AR}"
 fi
 
 if test -n "@RANLIB@"; then
@@ -122,12 +122,12 @@ fi
 if test "@host_os@" = darwin; then
   if test -n "@OBJDUMP@"; then
     OBJDUMP="@OBJDUMP@"
-    ac_cv_path_ac_pt_OBJDUMP="${OBJDUMP}"
+    ac_cv_path_OBJDUMP="${OBJDUMP}"
   fi
 
   if test -n "@DSYMUTIL@"; then
     DSYMUTIL="@DSYMUTIL@"
-    ac_cv_path_ac_pt_DSYMUTIL="${DSYMUTIL}"
+    ac_cv_path_DSYMUTIL="${DSYMUTIL}"
   fi
 fi