From eefd58579e1e7e777e90166d494e71bea8fc8b2e Mon Sep 17 00:00:00 2001 From: Matthaus Owens Date: Mon, 10 Aug 2015 12:35:17 -0700 Subject: [PATCH] Use test_path instead of which which was used to detect icc, but on some platforms such as solaris 10 which always returns 0, even when the command is not found on the path. This commit updates the invocation to use the test_path function instead, which does return non-zero on solaris 10 in the failure case. --- src/engine/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/build.sh b/src/engine/build.sh index 4c19c101b..bf3c695d7 100755 --- a/src/engine/build.sh +++ b/src/engine/build.sh @@ -150,9 +150,9 @@ case $BOOST_JAM_TOOLSET in ;; intel-linux) - which icc >/dev/null 2>&1 + test_path icc >/dev/null 2>&1 if test $? ; then - BOOST_JAM_CC=`which icc` + BOOST_JAM_CC=`test_path icc` echo "Found $BOOST_JAM_CC in environment" BOOST_JAM_TOOLSET_ROOT=`echo $BOOST_JAM_CC | sed -e 's/bin.*\/icc//'` # probably the most widespread