2 Makefile.pre.in | 25 +++++++++++++------------
3 1 file changed, 13 insertions(+), 12 deletions(-)
7 @@ -182,6 +182,7 @@ UNICODE_OBJS= @UNICODE_OBJS@
10 BUILDPYTHON= python$(BUILDEXE)
11 +HOSTPYTHON= $(BUILDPYTHON)
13 # The task to run while instrument when building the profile-opt target
14 PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
15 @@ -214,6 +215,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
16 ##########################################################################
18 PGEN= Parser/pgen$(EXE)
19 +HOSTPGEN= $(PGEN)$(EXE)
23 @@ -384,7 +386,7 @@ build_all_generate_profile:
24 $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov"
27 - ./$(BUILDPYTHON) $(PROFILE_TASK)
28 + $(HOSTPYTHON) $(PROFILE_TASK)
30 build_all_use_profile:
31 $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use"
32 @@ -402,14 +404,14 @@ $(BUILDPYTHON): Modules/python.o $(LIBRA
33 $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
35 platform: $(BUILDPYTHON)
36 - $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
37 + $(RUNSHARED) $(HOSTPYTHON) -E -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
40 # Build the shared modules
41 sharedmods: $(BUILDPYTHON)
42 @case $$MAKEFLAGS in \
43 - *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
44 - *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
45 + *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
46 + *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
49 # Build static library
50 @@ -543,7 +545,7 @@ Modules/python.o: $(srcdir)/Modules/pyth
51 $(GRAMMAR_H) $(GRAMMAR_C): Parser/pgen.stamp
52 Parser/pgen.stamp: $(PGEN) $(GRAMMAR_INPUT)
53 -@$(INSTALL) -d Include
54 - $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
55 + $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
56 -touch Parser/pgen.stamp
59 @@ -708,7 +710,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/pytho
61 TESTOPTS= -l $(EXTRATESTOPTS)
62 TESTPROG= $(srcdir)/Lib/test/regrtest.py
63 -TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) -Wd -3 -E -tt $(TESTPYTHONOPTS)
64 +TESTPYTHON= $(RUNSHARED) $(HOSTPYTHON) -Wd -3 -E -tt $(TESTPYTHONOPTS)
66 -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
67 -$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
68 @@ -1062,7 +1064,7 @@ libainstall: all python-config
69 # Install the dynamically loadable modules
70 # This goes into $(exec_prefix)
71 sharedinstall: sharedmods
72 - $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
73 + $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \
75 --install-scripts=$(BINDIR) \
76 --install-platlib=$(DESTSHARED) \
77 @@ -1100,7 +1102,7 @@ frameworkinstallstructure: $(LDLIBRARY)
80 $(LN) -fsn include/python$(VERSION) $(DESTDIR)$(prefix)/Headers
81 - sed 's/%VERSION%/'"`$(RUNSHARED) ./$(BUILDPYTHON) -c 'import platform; print platform.python_version()'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
82 + sed 's/%VERSION%/'"`$(RUNSHARED) $(HOSTPYTHON) -c 'import platform; print platform.python_version()'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
83 $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
84 $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
85 $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
86 @@ -1135,7 +1137,7 @@ frameworkinstallextras:
87 # This installs a few of the useful scripts in Tools/scripts
89 SRCDIR=$(srcdir) $(RUNSHARED) \
90 - ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \
91 + $(HOSTPYTHON) $(srcdir)/Tools/scripts/setup.py install \
93 --install-scripts=$(BINDIR) \
95 @@ -1157,7 +1159,7 @@ config.status: $(srcdir)/configure
97 # Run reindent on the library
99 - ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib
100 + $(HOSTPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib
102 # Rerun configure with the same options as it was run last time,
103 # provided the config.status script exists
104 @@ -1260,7 +1262,7 @@ funny:
106 # Perform some verification checks on any modified files.
108 - $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py
109 + $(RUNSHARED) $(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py