diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-08-04 01:53:40 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-08-04 01:53:40 (GMT) |
| commit | 0c859f362c77f705a235a1a8513313e5d6d01c84 (patch) | |
| tree | c5a0030fb1ffb8d208afa8fac0a64cd60ea10bb4 /configure.ac | |
| parent | 0de01c4b30858209a873fcc69c4cde80be608557 (diff) | |
| parent | 43a94a7e2fd130ed15bd8a0a190f4d230b607514 (diff) | |
| download | cpython-0c859f362c77f705a235a1a8513313e5d6d01c84.zip cpython-0c859f362c77f705a235a1a8513313e5d6d01c84.tar.gz cpython-0c859f362c77f705a235a1a8513313e5d6d01c84.tar.bz2 | |
Issue #27641: Merge cross-compiling improvement from 3.5
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 1f3aba0..07b5ce9 100644 --- a/configure.ac +++ b/configure.ac @@ -49,7 +49,6 @@ fi AC_CONFIG_SRCDIR([Include/object.h]) AC_CONFIG_HEADER(pyconfig.h) -AC_SUBST(cross_compiling) AC_CANONICAL_HOST AC_SUBST(build) AC_SUBST(host) @@ -81,15 +80,16 @@ if test "$cross_compiling" = yes; then AC_MSG_RESULT($interp) PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp fi - PGEN_DEPENDENCY='' + # Used to comment out stuff for rebuilding generated files + GENERATED_COMMENT='#' elif test "$cross_compiling" = maybe; then AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) else PYTHON_FOR_BUILD='./$(BUILDPYTHON) -E' - PGEN_DEPENDENCY='$(PGEN)' + GENERATED_COMMENT='' fi AC_SUBST(PYTHON_FOR_BUILD) -AC_SUBST(PGEN_DEPENDENCY) +AC_SUBST(GENERATED_COMMENT) dnl Ensure that if prefix is specified, it does not end in a slash. If dnl it does, we get path names containing '//' which is both ugly and |