diff options
| author | Jack Nagel | 2013-12-04 00:37:11 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-12-04 00:37:57 -0600 |
| commit | c84f7d0ab2cc23c85d476c66d899b2855ede51be (patch) | |
| tree | f7f597945d6be9ccd0ae2fba01fe0586049ebd11 /Library | |
| parent | d18a4001b408d3d4aeec4819c398348d2a1d40eb (diff) | |
| download | brew-c84f7d0ab2cc23c85d476c66d899b2855ede51be.tar.bz2 | |
Revert "Revert "Split bsdmake wrapper out from make wrapper""
I think enough time has passed that it is safe to do this now.
This reverts commit 1003161a848970e782633959904ea776dda7e48b.
Diffstat (limited to 'Library')
| -rwxr-xr-x[l---------] | Library/ENV/4.3/bsdmake | 8 | ||||
| -rwxr-xr-x | Library/ENV/4.3/make | 10 |
2 files changed, 8 insertions, 10 deletions
diff --git a/Library/ENV/4.3/bsdmake b/Library/ENV/4.3/bsdmake index ac08cdcf9..72adb0941 120000..100755 --- a/Library/ENV/4.3/bsdmake +++ b/Library/ENV/4.3/bsdmake @@ -1 +1,7 @@ -make
\ No newline at end of file +#!/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" "$@" diff --git a/Library/ENV/4.3/make b/Library/ENV/4.3/make index 1d717718b..f7089de36 100755 --- a/Library/ENV/4.3/make +++ b/Library/ENV/4.3/make @@ -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 "$@" |