From 529ea398977212e30840243f4931839974729ffd Mon Sep 17 00:00:00 2001 From: Dusty Daemon Date: Fri, 20 Mar 2026 13:07:49 -0400 Subject: [PATCH] CI: Update Mac CI to use gmake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `gmake` is kept up to date while `make` is apple’s built in mac that is not updated and very old at this point. Changelog-None --- .github/workflows/macos.yaml | 4 ++-- configure | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml index 71ca8e9d235f..ba92acf8ee5e 100644 --- a/.github/workflows/macos.yaml +++ b/.github/workflows/macos.yaml @@ -37,7 +37,7 @@ jobs: run: | export PATH="/usr/local/opt:/Users/runner/.local/bin:/opt/homebrew/bin/python3.10/bin:$PATH" - brew install gnu-sed autoconf automake libtool protobuf openssl lowdown libsodium + brew install gnu-sed autoconf automake libtool protobuf openssl lowdown libsodium make # https://github.com/grpc/grpc/issues/31737#issuecomment-1323796842 export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1 @@ -50,7 +50,7 @@ jobs: export LIBRARY_PATH=/opt/homebrew/lib uv run ./configure --disable-valgrind --disable-compat - uv run make + uv run gmake - name: Start bitcoind in regtest mode run: | diff --git a/configure b/configure index bee8ab193574..8005f8733b93 100755 --- a/configure +++ b/configure @@ -220,7 +220,7 @@ have_function_sections() TMPOBJFILE=$CONFIG_VAR_FILE.$$.o echo "int foo(void); int foo(void) { return 0; }" > $TMPCFILE - $1 $2 -ffunction-sections -Wl,--gc-sections -c $TMPCFILE -o $TMPOBJFILE + $1 $2 -ffunction-sections -Wl,--gc-sections $TMPCFILE -o $TMPOBJFILE } usage()