From 954ac03a44efd352ca06a85caf2e2c04e49b3ede Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Wed, 12 Dec 2012 13:10:21 +0100
Subject: [PATCH] Cross compiling needs host and build settings. configure no
 longer creates a broken PYTHON_FOR_BUILD variable when --build is missing.

---
 Misc/NEWS    | 3 +++
 configure    | 2 ++
 configure.ac | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/Misc/NEWS b/Misc/NEWS
index c57b165ccd6..58675e86bf1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -316,6 +316,9 @@ Tests
 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
index 5fc460f2f2f..6407cc4b688 100755
--- a/configure
+++ b/configure
@@ -2943,6 +2943,8 @@ $as_echo_n "checking for python interpreter for cross build... " >&6; }
 $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
index 2738703b1b5..ef58a9fecf7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,8 @@ if test "$cross_compiling" = yes; then
         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