From 06eb6f250adafe8f89583999e144e21b4763c6aa Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Tue, 6 Aug 2024 22:50:19 +0100
Subject: [PATCH] build: Invoke GNU Make (gmake) for depends explicitly

---
 contrib/guix/guix-build       | 6 +++---
 contrib/guix/guix-clean       | 2 +-
 contrib/guix/libexec/build.sh | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build
index 2ea574fe4b98c3..0201cab565366e 100755
--- a/contrib/guix/guix-build
+++ b/contrib/guix/guix-build
@@ -128,7 +128,7 @@ fi
 for host in $HOSTS; do
     case "$host" in
         *darwin*)
-            OSX_SDK="$(make -C "${PWD}/depends" --no-print-directory HOST="$host" print-OSX_SDK | sed 's@^[^=]\+=@@g')"
+            OSX_SDK="$(gmake -C "${PWD}/depends" --no-print-directory HOST="$host" print-OSX_SDK | sed 's@^[^=]\+=@@g')"
             if [ -e "$OSX_SDK" ]; then
                 echo "Found macOS SDK at '${OSX_SDK}', using..."
                 break
@@ -276,7 +276,7 @@ mkdir -p "$VAR_BASE"
 # shellcheck disable=SC2046,SC2086
 {
     # Get depends precious dir definitions from depends
-    make -C "${PWD}/depends" \
+    gmake -C "${PWD}/depends" \
          --no-print-directory \
          -- $(printf "print-%s\n" $depends_precious_dir_names)
 
@@ -296,7 +296,7 @@ mkdir -p "$OUTDIR_BASE"
 # Download the depends sources now as we won't have internet access in the build
 # container
 for host in $HOSTS; do
-    make -C "${PWD}/depends" -j"$JOBS" download-"$(host_to_commonname "$host")" ${V:+V=1} ${SOURCES_PATH:+SOURCES_PATH="$SOURCES_PATH"}
+    gmake -C "${PWD}/depends" -j"$JOBS" download-"$(host_to_commonname "$host")" ${V:+V=1} ${SOURCES_PATH:+SOURCES_PATH="$SOURCES_PATH"}
 done
 
 # Usage: outdir_for_host HOST SUFFIX
diff --git a/contrib/guix/guix-clean b/contrib/guix/guix-clean
index 9af0a793cff7d4..adddbddd130862 100755
--- a/contrib/guix/guix-clean
+++ b/contrib/guix/guix-clean
@@ -18,7 +18,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/libexec/prelude.bash"
 # Required non-builtin commands should be invokable
 ################
 
-check_tools cat mkdir make git guix
+check_tools cat mkdir gmake git guix
 
 
 #############
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index fa6933b3328f29..0649d64294dab4 100755
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -166,7 +166,7 @@ export TZ="UTC"
 ####################
 
 # Build the depends tree, overriding variables that assume multilib gcc
-make -C depends --jobs="$JOBS" HOST="$HOST" \
+gmake -C depends --jobs="$JOBS" HOST="$HOST" \
                                    ${V:+V=1} \
                                    ${SOURCES_PATH+SOURCES_PATH="$SOURCES_PATH"} \
                                    ${BASE_CACHE+BASE_CACHE="$BASE_CACHE"} \