diff options
| author | Jack Nagel | 2014-12-05 16:54:07 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-12-05 16:54:33 -0500 |
| commit | d85d5fba22c6d3d2dbbe6368fde518092bd24cb0 (patch) | |
| tree | 07319f4512410f52ee3b99a795790e5b047fc1d8 | |
| parent | fed9c9a9bec870929c2a646e97096c277ae148f8 (diff) | |
| download | brew-d85d5fba22c6d3d2dbbe6368fde518092bd24cb0.tar.bz2 | |
Revert "Simplify bsdmake wrapper"
Fixes Homebrew/homebrew#34713.
This reverts commit e4461afd36f04b1cd3cf56ec0636202150ce0570.
| -rwxr-xr-x[l---------] | Library/ENV/4.3/bsdmake | 8 | ||||
| -rwxr-xr-x | Library/ENV/4.3/make | 2 |
2 files changed, 8 insertions, 2 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 fa7a19817..f7089de36 100755 --- a/Library/ENV/4.3/make +++ b/Library/ENV/4.3/make @@ -1,3 +1,3 @@ #!/bin/bash export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG" -exec xcrun "${0##*/}" "$@" +exec xcrun make "$@" |