summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier de Gaye <xdegaye@users.sourceforge.net>2016-07-07 16:00:22 (GMT)
committerXavier de Gaye <xdegaye@users.sourceforge.net>2016-07-07 16:00:22 (GMT)
commit4afd143d3e615ce2d65bcededafb2e2bcda0768f (patch)
treecd372a0745047d042b2f7ccfead20703b9e9af3f
parent2954f8399914c77e048f9e3358abfadb7a3f76e9 (diff)
downloadcpython-4afd143d3e615ce2d65bcededafb2e2bcda0768f.zip
cpython-4afd143d3e615ce2d65bcededafb2e2bcda0768f.tar.gz
cpython-4afd143d3e615ce2d65bcededafb2e2bcda0768f.tar.bz2
Issue #27434: Version of interpreter running a cross-build and source version must be the same.
-rw-r--r--Misc/NEWS3
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac2
3 files changed, 5 insertions, 2 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 142848b..263ba1d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -132,6 +132,9 @@ C API
Build
-----
+- Issue #27434: The interpreter that runs the cross-build, found in PATH, must
+ now be of the same feature version (e.g. 3.6) as the source being built.
+
- Issue #26930: Update Windows builds to use OpenSSL 1.0.2h.
- Issue #23968: Rename the platform directory from plat-$(MACHDEP) to
diff --git a/configure b/configure
index f6a4892..fbde7f6 100755
--- a/configure
+++ b/configure
@@ -3002,7 +3002,7 @@ $as_echo_n "checking for python interpreter for cross build... " >&6; }
if test -z "$PYTHON_FOR_BUILD"; then
for interp in python$PACKAGE_VERSION python3 python; do
which $interp >/dev/null 2>&1 || continue
- if $interp -c 'import sys;sys.exit(not sys.version_info[:2] >= (3,3))'; then
+ if $interp -c "import sys;sys.exit(not '.'.join(str(n) for n in sys.version_info[:2]) == '$PACKAGE_VERSION')"; then
break
fi
interp=
diff --git a/configure.ac b/configure.ac
index 60e8089..9b65ec1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,7 @@ if test "$cross_compiling" = yes; then
if test -z "$PYTHON_FOR_BUILD"; then
for interp in python$PACKAGE_VERSION python3 python; do
which $interp >/dev/null 2>&1 || continue
- if $interp -c 'import sys;sys.exit(not sys.version_info@<:@:2@:>@ >= (3,3))'; then
+ if $interp -c "import sys;sys.exit(not '.'.join(str(n) for n in sys.version_info@<:@:2@:>@) == '$PACKAGE_VERSION')"; then
break
fi
interp=