Issue #27490: Merge pgen cross-compile logic from 3.5

This commit is contained in:
Martin Panter 2016-07-28 01:30:06 +00:00
commit 4b53359090
5 changed files with 12 additions and 1 deletions

4
configure vendored
View file

@ -740,6 +740,7 @@ UNIVERSALSDK
CONFIG_ARGS
SOVERSION
VERSION
PGEN_DEPENDENCY
PYTHON_FOR_BUILD
PYTHON_FOR_GEN
host_os
@ -3050,14 +3051,17 @@ $as_echo_n "checking for python interpreter for cross build... " >&6; }
$as_echo "$interp" >&6; }
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=''
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'
PGEN_DEPENDENCY='$(PGEN)'
fi
if test "$prefix" != "/"; then
prefix=`echo "$prefix" | sed -e 's/\/$//g'`
fi