summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2012-12-12 12:10:32 (GMT)
committerChristian Heimes <christian@cheimes.de>2012-12-12 12:10:32 (GMT)
commitb92c40ef9b7ce7b12d88bbb6531fa6870444f704 (patch)
treea2fada69225776433cc17d7fde43bf7489d1c4b8
parente6f228011eb6dda360685d62b15a4263ae3f1960 (diff)
parent954ac03a44efd352ca06a85caf2e2c04e49b3ede (diff)
downloadcpython-b92c40ef9b7ce7b12d88bbb6531fa6870444f704.zip
cpython-b92c40ef9b7ce7b12d88bbb6531fa6870444f704.tar.gz
cpython-b92c40ef9b7ce7b12d88bbb6531fa6870444f704.tar.bz2
Cross compiling needs host and build settings. configure no longer
creates a broken PYTHON_FOR_BUILD variable when --build is missing.
-rw-r--r--Misc/NEWS3
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac2
3 files changed, 7 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index d880f88..2a9c00d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -467,6 +467,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 901ea4a..550dd71 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 bc49deb..ddbbcdf 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