From 152946e4a2112c5920ca5fff28dddae729b9bd14 Mon Sep 17 00:00:00 2001
From: Martin Kinkelin <mkinkelin@symmetryinvestments.com>
Date: Sun, 27 Oct 2024 12:44:45 +0100
Subject: [PATCH] macOS CI: Upgrade GNU make in ci/cirrusci.sh

This should fix Phobos CI, which expects such prerequisites provisioning
to happen in DMD's ci/cirrusci.sh. Because this YAML addition hasn't been
duplicated in Phobos, Phobos CI is still using the default make on macOS,
which is too old and doesn't support the newly required `private` modifier.
---
 .github/workflows/main.yml | 5 -----
 ci/cirrusci.sh             | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 99dbe0a194b4..b3fcb82b0728 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -115,11 +115,6 @@ jobs:
         uses: dlang-community/setup-dlang@v1.3.0
         with:
           compiler: ${{ matrix.host_dmd }}
-      - name: 'MacOS: Install recent make'
-        if: runner.os == 'macOS'
-        run: |
-          brew install make
-          echo "PATH=/usr/local/opt/make/libexec/gnubin:$PATH" >> $GITHUB_ENV
 
       - name: Set up repos
         run: |
diff --git a/ci/cirrusci.sh b/ci/cirrusci.sh
index d02cb7689e08..397bf9229055 100755
--- a/ci/cirrusci.sh
+++ b/ci/cirrusci.sh
@@ -27,6 +27,11 @@ if [ "$OS_NAME" == "linux" ]; then
   fi
   apt-get -q update
   apt-get install -yq $packages
+elif [ "$OS_NAME" == "osx" ]; then
+  # update GNU make
+  brew install make
+  rm /usr/bin/make
+  ln -s /usr/local/opt/make/libexec/gnubin/make /usr/bin/make
 elif [ "$OS_NAME" == "freebsd" ]; then
   packages="git gmake devel/llvm12"
   if [ "$HOST_DMD" == "dmd-2.079.0" ] ; then