summaryrefslogtreecommitdiff
path: root/bootstrap.sh
diff options
context:
space:
mode:
authorSteven Watanabe <steven@providere-consulting.com>2015-02-28 20:31:53 -0700
committerSteven Watanabe <steven@providere-consulting.com>2015-02-28 20:31:53 -0700
commitedca8b1e9317dd6f0ffc46536841708be8480e5d (patch)
tree7ff5bb7a75afed3d11e543d98ecaec5ce1314948 /bootstrap.sh
parent9275200554ad269d698daace7c1f5406a4aa4df8 (diff)
downloadboost-edca8b1e9317dd6f0ffc46536841708be8480e5d.tar.gz
Don't initialize python in project-config.jam if it's already been configured in user-config.jam.
Diffstat (limited to 'bootstrap.sh')
-rwxr-xr-xbootstrap.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/bootstrap.sh b/bootstrap.sh
index 2bc515b600..9e61569e2e 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -353,7 +353,11 @@ if test "x$flag_no_python" = x; then
cat >> project-config.jam <<EOF
# Python configuration
-using python : $PYTHON_VERSION : $PYTHON_ROOT ;
+import python ;
+if ! [ python.configured ]
+{
+ using python : $PYTHON_VERSION : $PYTHON_ROOT ;
+}
EOF
fi