diff options
author | Keith M Wesolowski <wesolows@foobazco.org> | 2013-11-26 00:03:50 +0000 |
---|---|---|
committer | Keith M Wesolowski <wesolows@foobazco.org> | 2013-11-26 00:03:50 +0000 |
commit | 3112ced86c9b246919563821c872bc85efa98932 (patch) | |
tree | def7f873663dfca5cc8ea869b6f799b583f39cdc | |
parent | a1a9c17f4e4825d545e3ef72bbbd75c89a32de83 (diff) | |
parent | b1a0a82d00eef0593b4a1c3b5c5a8fd395f3c826 (diff) | |
download | illumos-joyent-3112ced86c9b246919563821c872bc85efa98932.tar.gz |
[illumos-gate merge]
commit b1a0a82d00eef0593b4a1c3b5c5a8fd395f3c826
4357 bldenv $MAKE checking is pathological
-rw-r--r-- | usr/src/tools/scripts/bldenv.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr/src/tools/scripts/bldenv.sh b/usr/src/tools/scripts/bldenv.sh index 9a73aced58..b381dbb768 100644 --- a/usr/src/tools/scripts/bldenv.sh +++ b/usr/src/tools/scripts/bldenv.sh @@ -273,11 +273,13 @@ if [[ "${SUNWSPRO}" != "" ]]; then export PATH="${SUNWSPRO}/bin:$PATH" fi -if [[ -x "${MAKE}" ]]; then - export PATH="$(dirname -- "${MAKE}"):$PATH" -else - print "\$MAKE points to garbage" - exit 1 +if [[ -n "${MAKE}" ]]; then + if [[ -x "${MAKE}" ]]; then + export PATH="$(dirname -- "${MAKE}"):$PATH" + else + print "\$MAKE (${MAKE}) is not a valid executible" + exit 1 + fi fi TOOLS="${SRC}/tools" |