Merge pull request #15666 from carlocab/make-shim

shims/mac: handle usage of Homebrew `make`

Library/Homebrew/shims/mac/super/bsdmake

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-export HOMEBREW_CCCFG="O${HOMEBREW_CCCFG}"
-exec xcrun bsdmake "$@"

Library/Homebrew/shims/mac/super/bsdmake

@@ -0,0 +1 @@
+make

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