aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Weil <sw@weilnetz.de>2013-11-14 19:07:03 +0100
committerMichael Tokarev <mjt@tls.msk.ru>2013-11-17 00:29:15 +0400
commit52510f8b2c0486e6c2743b1d069b3584ef4524da (patch)
tree6d39f73026240746fec54fb6a353123b67295824
parent485e741cd15655b4032b07b8a912aa5c7a4f2028 (diff)
downloadqemu-52510f8b2c0486e6c2743b1d069b3584ef4524da.zip
qemu-52510f8b2c0486e6c2743b1d069b3584ef4524da.tar.gz
qemu-52510f8b2c0486e6c2743b1d069b3584ef4524da.tar.bz2
configure: Use -B switch only for Python versions which support it
Commit 1d984a67a95d88f3e708b077dab8adeb47c38c93 added the -B switch unconditionally. This breaks Python versions before 2.6 which don't support that switch. Now configure adds -B only if it is accepted by the Python interpreter. This modification introduces a small incompatibility because -B might now also be added when configure was called with --python=PYTHON_INTERPRETER. Signed-off-by: Stefan Weil <sw@weilnetz.de> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-rwxr-xr-xconfigure9
1 files changed, 8 insertions, 1 deletions
diff --git a/configure b/configure
index 9addff1..eb2c31d 100755
--- a/configure
+++ b/configure
@@ -579,7 +579,7 @@ fi
: ${make=${MAKE-make}}
: ${install=${INSTALL-install}}
-: ${python=${PYTHON-python -B}}
+: ${python=${PYTHON-python}}
: ${smbd=${SMBD-/usr/sbin/smbd}}
# Default objcc to clang if available, otherwise use CC
@@ -1400,6 +1400,13 @@ if ! $python -c 'import sys; sys.exit(sys.version_info < (2,4) or sys.version_in
"Use --python=/path/to/python to specify a supported Python."
fi
+# The -B switch was added in Python 2.6.
+# If it is supplied, compiled files are not written.
+# Use it for Python versions which support it.
+if $python -B -c 'import sys; sys.exit(0)' 2>/dev/null; then
+ python="$python -B"
+fi
+
if test -z "${target_list+xxx}" ; then
target_list="$default_target_list"
else