[Python-checkins] cpython (merge 3.3 -> default): Cross compiling needs host and build settings. configure no longer

Wed Dec 12 13:10:43 CET 2012

http://hg.python.org/cpython/rev/e680202e5603
changeset: 80833:e680202e5603
parent: 80831:76abdc4b3795
parent: 80832:bdd4ec5eb621
user: Christian Heimes <christian at cheimes.de>
date: Wed Dec 12 13:10:32 2012 +0100
summary:
 Cross compiling needs host and build settings. configure no longer
creates a broken PYTHON_FOR_BUILD variable when --build is missing.
files:
 Misc/NEWS | 3 +++
 configure | 2 ++
 configure.ac | 2 ++
 3 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -467,6 +467,9 @@
 Build
 -----
 
+- Cross compiling needs host and build settings. configure no longer
+ creates a broken PYTHON_FOR_BUILD variable when --build is missing.
+
 - Fix cross compiling issue in setup.py, ensure that lib_dirs and inc_dirs are
 defined in cross compiling mode, too.
 
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -2943,6 +2943,8 @@
 $as_echo "$interp" >&6; }
 	PYTHON_FOR_BUILD="_PYTHON_PROJECT_BASE=$srcdir"' _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp
 fi
+elif test "$cross_compiling" = maybe; then
+ as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5
 else
 PYTHON_FOR_BUILD='./$(BUILDPYTHON) -E'
 fi
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,8 @@
 AC_MSG_RESULT($interp)
 	PYTHON_FOR_BUILD="_PYTHON_PROJECT_BASE=$srcdir"' _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp
 fi
+elif test "$cross_compiling" = maybe; then
+ AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
 else
 PYTHON_FOR_BUILD='./$(BUILDPYTHON) -E'
 fi
-- 
Repository URL: http://hg.python.org/cpython
