diff options
| author | Robert Mustacchi <rm@joyent.com> | 2013-11-24 17:46:43 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2013-11-25 13:41:02 -0800 |
| commit | b1a0a82d00eef0593b4a1c3b5c5a8fd395f3c826 (patch) | |
| tree | 39b5b9c18ed68c4affab64915af8793fb6d2ce8f | |
| parent | c5accfb2728453a874214835d99897e09a0cf3f2 (diff) | |
| download | illumos-joyent-b1a0a82d00eef0593b4a1c3b5c5a8fd395f3c826.tar.gz | |
4357 bldenv $MAKE checking is pathological
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Approved by: Dan McDonald <danmcd@nexenta.com>
| -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" |