aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Howell2012-09-13 11:26:00 -0400
committerMax Howell2012-09-13 11:28:31 -0400
commitffc6423d7344cab3f9ca4dda9a4e982582175d99 (patch)
tree8de297b6263ae7f74d70aa96bc0adbe9a6549180
parent93502785c4cefd5bf830703861d156be98000508 (diff)
downloadbrew-ffc6423d7344cab3f9ca4dda9a4e982582175d99.tar.bz2
Look harder for bsdmake
bsdmake used to be keg-only, so some users still have it unlinked (presumably they never run brew-doctor). Even though there is code to abort if dependencies are unlinked, it appears broken for this case. So let's just be thorough anyway. Closes Homebrew/homebrew#14751.
-rwxr-xr-xLibrary/ENV/4.3/make5
1 files changed, 4 insertions, 1 deletions
diff --git a/Library/ENV/4.3/make b/Library/ENV/4.3/make
index aff18372e..b3df33114 100755
--- a/Library/ENV/4.3/make
+++ b/Library/ENV/4.3/make
@@ -2,7 +2,10 @@
export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG"
if [ $(basename "$0") == "bsdmake" ]; then
pwd="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
- exec "$pwd/../../../bin/bsdmake" "$@"
+ bsd="$pwd/../../../bin/bsdmake"
+ # bsdmake used to be keg-only: support users who don't run brew doctor
+ [ -x "$bsd" ] || bsd="$(brew --prefix bsdmake)/bin/bsdmake"
+ exec "$bsd" "$@"
else
exec xcrun make "$@"
fi