Merge pull request #15666 from carlocab/make-shim

shims/mac: handle usage of Homebrew `make`
Homebrew · Jul 12, 2023 · ae7b791 · ae7b791
2 parents db4a95c + 9ece93e
commit ae7b791
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/Library/Homebrew/shims/mac/super/bsdmake b/Library/Homebrew/shims/mac/super/bsdmake
diff --git a/Library/Homebrew/shims/mac/super/bsdmake b/Library/Homebrew/shims/mac/super/bsdmake
@@ -0,0 +1 @@
+make
diff --git 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