From 6fdc13c61f0e5ef6be0c03fa475741ab2cd57672 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Mon, 18 Jul 2022 15:58:02 +0100
Subject: [PATCH 1/2] build: Fix autoconf variable names for tools found by
 `AC_PATH_TOOL`

See the `AC_PATH_TOOL` macro implementation.
---
 configure.ac           | 1 +
 depends/config.site.in | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index db7ac620b9d..0cd88543c6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2049,5 +2049,6 @@ echo "  CPPFLAGS        = $DEBUG_CPPFLAGS $HARDENED_CPPFLAGS $CORE_CPPFLAGS $CPP
 echo "  CXX             = $CXX"
 echo "  CXXFLAGS        = $LTO_CXXFLAGS $DEBUG_CXXFLAGS $HARDENED_CXXFLAGS $WARN_CXXFLAGS $NOWARN_CXXFLAGS $ERROR_CXXFLAGS $GPROF_CXXFLAGS $CORE_CXXFLAGS $CXXFLAGS"
 echo "  LDFLAGS         = $LTO_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 189330c42da..f7e770343c4 100644
--- a/depends/config.site.in
+++ b/depends/config.site.in
@@ -105,7 +105,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
@@ -126,17 +126,17 @@ fi
 if test "@host_os@" = darwin; then
   if test -n "@OTOOL@"; then
     OTOOL="@OTOOL@"
-    ac_cv_path_ac_pt_OTOOL="${OTOOL}"
+    ac_cv_path_OTOOL="${OTOOL}"
   fi
 
   if test -n "@INSTALL_NAME_TOOL@"; then
     INSTALL_NAME_TOOL="@INSTALL_NAME_TOOL@"
-    ac_cv_path_ac_pt_INSTALL_NAME_TOOL="${INSTALL_NAME_TOOL}"
+    ac_cv_path_INSTALL_NAME_TOOL="${INSTALL_NAME_TOOL}"
   fi
 
   if test -n "@DSYMUTIL@"; then
     DSYMUTIL="@DSYMUTIL@"
-    ac_cv_path_ac_pt_DSYMUTIL="${DSYMUTIL}"
+    ac_cv_path_DSYMUTIL="${DSYMUTIL}"
   fi
 fi
 

From 658685af935e89ddd2ca326b3e13e271d166014d Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Thu, 16 Jun 2022 10:19:49 +0100
Subject: [PATCH 2/2] depends: default to using GCC tool wrappers (with GCC)

This improves support for LTO by using gcc wrappers for ar, nm, ranlib,
that correctly setup plugin arguments for LTO.

Other HOSTS are using clang.
---
 depends/hosts/linux.mk   | 4 ++++
 depends/hosts/mingw32.mk | 4 ++++
 depends/hosts/netbsd.mk  | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/depends/hosts/linux.mk b/depends/hosts/linux.mk
index b101043439d..635d3d16da9 100644
--- a/depends/hosts/linux.mk
+++ b/depends/hosts/linux.mk
@@ -5,6 +5,10 @@ ifneq ($(LTO),)
 linux_CFLAGS += -flto
 linux_CXXFLAGS += -flto
 linux_LDFLAGS += -flto
+
+linux_AR = $(host_toolchain)gcc-ar
+linux_NM = $(host_toolchain)gcc-nm
+linux_RANLIB = $(host_toolchain)gcc-ranlib
 endif
 
 linux_release_CFLAGS=-O2
diff --git a/depends/hosts/mingw32.mk b/depends/hosts/mingw32.mk
index b98f9ab7acc..fc1cc1afbe5 100644
--- a/depends/hosts/mingw32.mk
+++ b/depends/hosts/mingw32.mk
@@ -9,6 +9,10 @@ ifneq ($(LTO),)
 mingw32_CFLAGS += -flto
 mingw32_CXXFLAGS += -flto
 mingw32_LDFLAGS += -flto
+
+mingw32_AR = $(host_toolchain)gcc-ar
+mingw32_NM = $(host_toolchain)gcc-nm
+mingw32_RANLIB = $(host_toolchain)gcc-ranlib
 endif
 
 mingw32_release_CFLAGS=-O2
diff --git a/depends/hosts/netbsd.mk b/depends/hosts/netbsd.mk
index 8342dcc6ede..14121dca20f 100644
--- a/depends/hosts/netbsd.mk
+++ b/depends/hosts/netbsd.mk
@@ -5,6 +5,10 @@ ifneq ($(LTO),)
 netbsd_CFLAGS += -flto
 netbsd_CXXFLAGS += -flto
 netbsd_LDFLAGS += -flto
+
+netbsd_AR = $(host_toolchain)gcc-ar
+netbsd_NM = $(host_toolchain)gcc-nm
+netbsd_RANLIB = $(host_toolchain)gcc-ranlib
 endif
 
 netbsd_CXXFLAGS=$(netbsd_CFLAGS)