aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoko@python.org <doko@python.org>2013-01-25 18:45:41 +0100
committerdoko@python.org <doko@python.org>2013-01-25 18:45:41 +0100
commit90c8d06d687eed87fa61bf6bcc3a40beeaef39cd (patch)
tree1e1622269d0aed50e8354deb164cf9498c54e172 /Makefile.pre.in
parentIssue #1602133: 'environ' is not really available with shared libraries on OS... (diff)
parent- Issue #17031: Fix running regen in cross builds. (diff)
downloadcpython-90c8d06d687eed87fa61bf6bcc3a40beeaef39cd.tar.gz
cpython-90c8d06d687eed87fa61bf6bcc3a40beeaef39cd.tar.bz2
cpython-90c8d06d687eed87fa61bf6bcc3a40beeaef39cd.zip
- Issue #17031: Fix running regen in cross builds.
Diffstat (limited to 'Makefile.pre.in')
-rw-r--r--Makefile.pre.in9
1 files changed, 8 insertions, 1 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 8297004c0b3..a9a68e3ef1a 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -203,7 +203,8 @@ BUILDPYTHON= python$(BUILDEXE)
PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@
_PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@
-HOST_GNU_TYPE= @host@
+BUILD_GNU_TYPE= @build@
+HOST_GNU_TYPE= @host@
# The task to run while instrument when building the profile-opt target
PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
@@ -1123,6 +1124,12 @@ $(srcdir)/Lib/$(PLATDIR):
export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \
export EXE; EXE="$(BUILDEXE)"; \
if [ -n "$(MULTIARCH)" ]; then export MULTIARCH; MULTIARCH=$(MULTIARCH); fi; \
+ export PYTHON_FOR_BUILD; \
+ if [ "$(BUILD_GNU_TYPE)" = "$(HOST_GNU_TYPE)" ]; then \
+ PYTHON_FOR_BUILD="$(BUILDPYTHON)"; \
+ else \
+ PYTHON_FOR_BUILD="$(PYTHON_FOR_BUILD)"; \
+ fi; \
cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
python-config: $(srcdir)/Misc/python-config.in