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

Revert "Split bsdmake wrapper out from make wrapper"

Browse Source 
This reverts commit ba7ec6eb2f650ebc5a0ae09547eea423dbd45173.

Temporarily mitigate bug fixed in 1153d0f9e20d0b6a19203707b609634f8fea1ad5.
This commit is contained in:
Jack Nagel 2013-11-14 09:40:50 -06:00
parent 8335401bc3
commit 6163c2a98e
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/ENV/4.3/bsdmake
View File

@ -1,7 +0,0 @@
#!/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" "$@"

1
Library/ENV/4.3/bsdmake Symbolic link
View File

@ -0,0 +1 @@
make

10
Library/ENV/4.3/make
View File

@ -1,3 +1,11 @@
#!/bin/bash #!/bin/bash
export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG" export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG"
exec xcrun make "$@" 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