admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Revert "Revert "Split bsdmake wrapper out from make wrapper""

Browse Source 
I think enough time has passed that it is safe to do this now.

This reverts commit 1003161a848970e782633959904ea776dda7e48b.
This commit is contained in:
Jack Nagel 2013-12-04 00:37:11 -06:00
parent d18a4001b4
commit c84f7d0ab2
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Library/ENV/4.3/bsdmake
View File

@ -1 +0,0 @@
make

7
Library/ENV/4.3/bsdmake Executable file
View File

@ -0,0 +1,7 @@
#!/bin/bash
export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG"
pwd="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
bsd="$pwd/../../../bin/bsdmake"
# bsdmake used to be keg-only: support users who don't run brew doctor
[ -x "$bsd" ] || bsd="$(${HOMEBREW_BREW_FILE} --prefix bsdmake)/bin/bsdmake"
exec "$bsd" "$@"

10
Library/ENV/4.3/make
View File

@ -1,11 +1,3 @@
#!/bin/bash
export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG"
if [ $(basename "$0") == "bsdmake" ]; then
pwd="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
bsd="$pwd/../../../bin/bsdmake"
# bsdmake used to be keg-only: support users who don't run brew doctor
[ -x "$bsd" ] || bsd="$(${HOMEBREW_BREW_FILE} --prefix bsdmake)/bin/bsdmake"
exec "$bsd" "$@"
else
exec xcrun make "$@"
fi
exec xcrun make "$@"