File tree 5 files changed +12
-1
lines changed
5 files changed +12
-1
lines changed Original file line number Diff line number Diff line change @@ -789,7 +789,7 @@ Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile
789
789
790
790
$(IO_OBJS): $(IO_H)
791
791
792
- $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN)
792
+ $(GRAMMAR_H): $(GRAMMAR_INPUT) @PGEN_DEPENDENCY@
793
793
@$(MKDIR_P) Include
794
794
# Avoid copying the file onto itself for an in-tree build
795
795
if test "$(cross_compiling)" != "yes"; then \
Original file line number Diff line number Diff line change @@ -1120,6 +1120,7 @@ Steven Pemberton
1120
1120
Bo Peng
1121
1121
Santiago Peresón
1122
1122
George Peristerakis
1123
+ Thomas Perl
1123
1124
Mathieu Perreault
1124
1125
Mark Perrego
1125
1126
Trevor Perrin
Original file line number Diff line number Diff line change @@ -145,6 +145,9 @@ Windows
145
145
Build
146
146
-----
147
147
148
+ - Issue #27490: Do not build pgen when cross-compiling. Patch by Thomas
149
+ Perl.
150
+
148
151
- Issue #26662: Set PYTHON_FOR_GEN in configure as the Python program to be
149
152
used for file generation during the build.
150
153
Original file line number Diff line number Diff line change @@ -739,6 +739,7 @@ UNIVERSALSDK
739
739
CONFIG_ARGS
740
740
SOVERSION
741
741
VERSION
742
+ PGEN_DEPENDENCY
742
743
PYTHON_FOR_BUILD
743
744
PYTHON_FOR_GEN
744
745
host_os
@@ -3049,14 +3050,17 @@ $as_echo_n "checking for python interpreter for cross build... " >&6; }
3049
3050
$as_echo " $interp " >&6 ; }
3050
3051
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
3051
3052
fi
3053
+ PGEN_DEPENDENCY=' '
3052
3054
elif test " $cross_compiling " = maybe; then
3053
3055
as_fn_error $? " Cross compiling required --host=HOST-TUPLE and --build=ARCH" " $LINENO " 5
3054
3056
else
3055
3057
PYTHON_FOR_BUILD=' ./$(BUILDPYTHON) -E'
3058
+ PGEN_DEPENDENCY=' $(PGEN)'
3056
3059
fi
3057
3060
3058
3061
3059
3062
3063
+
3060
3064
if test " $prefix " ! = " /" ; then
3061
3065
prefix=` echo " $prefix " | sed -e ' s/\/$//g' `
3062
3066
fi
Original file line number Diff line number Diff line change @@ -81,12 +81,15 @@ if test "$cross_compiling" = yes; then
81
81
AC_MSG_RESULT ( $interp )
82
82
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
83
83
fi
84
+ PGEN_DEPENDENCY=''
84
85
elif test "$cross_compiling" = maybe; then
85
86
AC_MSG_ERROR ( [ Cross compiling required --host=HOST-TUPLE and --build=ARCH] )
86
87
else
87
88
PYTHON_FOR_BUILD='./$(BUILDPYTHON) -E'
89
+ PGEN_DEPENDENCY='$(PGEN)'
88
90
fi
89
91
AC_SUBST ( PYTHON_FOR_BUILD )
92
+ AC_SUBST ( PGEN_DEPENDENCY )
90
93
91
94
dnl Ensure that if prefix is specified, it does not end in a slash. If
92
95
dnl it does, we get path names containing '//' which is both ugly and
You can’t perform that action at this time.
0 commit comments