From 9ece93ea498380caaad39d254706bacb20db3d62 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 12 Jul 2023 02:16:32 +0800 Subject: [PATCH] shims/mac: handle usage of Homebrew `make` We have a handful of formulae that use Homebrew `make` to build. Doing this evades our compiler shims. Let's try to avoid this by allowing our shims to support usage of Homebrew `make` by calling it as `gmake` in the formula. --- Library/Homebrew/shims/mac/super/bsdmake | 5 +---- Library/Homebrew/shims/mac/super/make | 10 +++++++++- 2 files changed, 10 insertions(+), 5 deletions(-) mode change 100755 => 120000 Library/Homebrew/shims/mac/super/bsdmake diff --git a/Library/Homebrew/shims/mac/super/bsdmake b/Library/Homebrew/shims/mac/super/bsdmake deleted file mode 100755 index 893e19f7f6..0000000000 --- a/Library/Homebrew/shims/mac/super/bsdmake +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -export HOMEBREW_CCCFG="O${HOMEBREW_CCCFG}" -exec xcrun bsdmake "$@" diff --git a/Library/Homebrew/shims/mac/super/bsdmake b/Library/Homebrew/shims/mac/super/bsdmake new file mode 120000 index 0000000000..ac08cdcf95 --- /dev/null +++ b/Library/Homebrew/shims/mac/super/bsdmake @@ -0,0 +1 @@ +make \ No newline at end of file diff --git a/Library/Homebrew/shims/mac/super/make b/Library/Homebrew/shims/mac/super/make index 6677f67329..3c29e70b9c 100755 --- a/Library/Homebrew/shims/mac/super/make +++ b/Library/Homebrew/shims/mac/super/make @@ -1,4 +1,12 @@ #!/bin/bash export HOMEBREW_CCCFG="O${HOMEBREW_CCCFG}" -exec xcrun "make" "$@" + +SHIM_FILE="${0##*/}" + +if xcrun --find "${SHIM_FILE}" &>/dev/null +then + exec xcrun "${SHIM_FILE}" "$@" +else + exec xcrun make "$@" +fi