From ffc6423d7344cab3f9ca4dda9a4e982582175d99 Mon Sep 17 00:00:00 2001 From: Max Howell Date: Thu, 13 Sep 2012 11:26:00 -0400 Subject: 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. --- Library/ENV/4.3/make | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Library') 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 -- cgit v1.2.3