Author: vedge
Date: 2008-10-28 08:57:33 -0300 (Tue, 28 Oct 2008)
New Revision: 762
Modified:
trunk/BSDBuild/Core.pm
trunk/BSDBuild/cc.pm
trunk/BSDBuild/cxx.pm
Log:
make sure not to pick up directories when scanning $PATH for programs.
Modified: trunk/BSDBuild/Core.pm
===================================================================
--- trunk/BSDBuild/Core.pm 2008-10-27 11:48:44 UTC (rev 761)
+++ trunk/BSDBuild/Core.pm 2008-10-28 11:57:33 UTC (rev 762)
@@ -91,9 +91,11 @@
$define=""
for path in `echo \$PATH | sed 's/:/ /g'`; do
if [ -x "\${path}/$bin" ]; then
- $define=`\${path}/$bin $args`
- MK_EXEC_FOUND="Yes"
- break
+ if [ -f "\${path}/$bin" ]; then
+ $define=`\${path}/$bin $args`
+ MK_EXEC_FOUND="Yes"
+ break
+ fi
fi
done
if [ "\${cache}" != "" ]; then
@@ -129,15 +131,17 @@
$define=""
for path in `echo \$PATH | sed 's/:/ /g'`; do
if [ -x "\${path}/$bin" ]; then
- if [ "\$MK_EXEC_FOUND" = "Yes" ]; then
- echo "yes."
- echo "* Warning: Multiple '$bin' exist in PATH
(using \$MK_EXEC_FOUND_PATH)"
- echo "* Warning: Multiple '$bin' exist in PATH
(using \$MK_EXEC_FOUND_PATH)" >> config.log
- break;
+ if [ -f "\${path}/$bin" ]; then
+ if [ "\$MK_EXEC_FOUND" = "Yes" ]; then
+ echo "yes."
+ echo "* Warning: Multiple '$bin' exist
in PATH (using \$MK_EXEC_FOUND_PATH)"
+ echo "* Warning: Multiple '$bin' exist
in PATH (using \$MK_EXEC_FOUND_PATH)" >> config.log
+ break;
+ fi
+ $define=`\${path}/$bin $args`
+ MK_EXEC_FOUND="Yes"
+ MK_EXEC_FOUND_PATH="\${path}/$bin"
fi
- $define=`\${path}/$bin $args`
- MK_EXEC_FOUND="Yes"
- MK_EXEC_FOUND_PATH="\${path}/$bin"
fi
done
if [ "\${cache}" != "" ]; then
@@ -176,8 +180,10 @@
$define=""
for path in `echo \$PATH | sed 's/:/ /g'`; do
if [ -x "\${path}/$bin" ]; then
- $define=`\${path}/$bin $args`
- break
+ if [ -f "\${path}/$bin" ]; then
+ $define=`\${path}/$bin $args`
+ break
+ fi
fi
done
EOF
Modified: trunk/BSDBuild/cc.pm
===================================================================
--- trunk/BSDBuild/cc.pm 2008-10-27 11:48:44 UTC (rev 761)
+++ trunk/BSDBuild/cc.pm 2008-10-28 11:57:33 UTC (rev 762)
@@ -32,11 +32,15 @@
if [ "$CC" = "" ]; then
for i in `echo $PATH |sed 's/:/ /g'`; do
if [ -x "${i}/cc" ]; then
- CC="${i}/cc"
- break
+ if [ -f "${i}/cc" ]; then
+ CC="${i}/cc"
+ break
+ fi
elif [ -x "${i}/gcc" ]; then
- CC="${i}/gcc"
- break
+ if [ -f "${i}/gcc" ]; then
+ CC="${i}/gcc"
+ break
+ fi
fi
done
if [ "$CC" = "" ]; then
Modified: trunk/BSDBuild/cxx.pm
===================================================================
--- trunk/BSDBuild/cxx.pm 2008-10-27 11:48:44 UTC (rev 761)
+++ trunk/BSDBuild/cxx.pm 2008-10-28 11:57:33 UTC (rev 762)
@@ -30,9 +30,15 @@
if [ "$CXX" = "" ]; then
for i in `echo $PATH |sed 's/:/ /g'`; do
if [ -x "${i}/c++" ]; then
- CXX="${i}/c++"
+ if [ -f "${i}/c++" ]; then
+ CXX="${i}/c++"
+ break
+ fi
elif [ -x "${i}/gcc" ]; then
- CXX="${i}/gcc"
+ if [ -f "${i}/gcc" ]; then
+ CXX="${i}/gcc"
+ break
+ fi
fi
done
if [ "$CXX" = "" ]; then
_______________________________________________
BSDBuild-Commits mailing list
[email protected]
http://mail231.csoft.net/mailman/listinfo/bsdbuild-commits
