diff options
| author | Jack Nagel | 2013-11-14 09:40:50 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-11-14 09:48:20 -0600 |
| commit | 1003161a848970e782633959904ea776dda7e48b (patch) | |
| tree | c17f75ae198f5ba88b9b5d83a492d64d8dc26d02 /Library | |
| parent | c4332fe4d0e11a968de918696d2d9ad0d95510c3 (diff) | |
| download | homebrew-1003161a848970e782633959904ea776dda7e48b.tar.bz2 | |
Revert "Split bsdmake wrapper out from make wrapper"
This reverts commit ba7ec6eb2f650ebc5a0ae09547eea423dbd45173.
Temporarily mitigate bug fixed in 1153d0f9e20d0b6a19203707b609634f8fea1ad5.
Diffstat (limited to 'Library')
| l---------[-rwxr-xr-x] | Library/ENV/4.3/bsdmake | 8 | ||||
| -rwxr-xr-x | Library/ENV/4.3/make | 10 |
2 files changed, 10 insertions, 8 deletions
diff --git a/Library/ENV/4.3/bsdmake b/Library/ENV/4.3/bsdmake index 72adb0941..ac08cdcf9 100755..120000 --- a/Library/ENV/4.3/bsdmake +++ b/Library/ENV/4.3/bsdmake @@ -1,7 +1 @@ -#!/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" "$@" +make
\ No newline at end of file diff --git a/Library/ENV/4.3/make b/Library/ENV/4.3/make index f7089de36..1d717718b 100755 --- a/Library/ENV/4.3/make +++ b/Library/ENV/4.3/make @@ -1,3 +1,11 @@ #!/bin/bash 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 |