@@ -4,6 +4,7 @@ OUTDIR := $(ROOT)/build
44
55BUILD := $(HERE ) /build.py
66NULL :=
7+ SPACE := $(subst ,, )
78
89ifndef PYBUILD_TARGET_TRIPLE
910 $(error PYBUILD_TARGET_TRIPLE not defined)
@@ -25,9 +26,7 @@ ifndef PYBUILD_PYTHON_VERSION
2526 $(error PYBUILD_PYTHON_VERSION not defined)
2627endif
2728
28- ifndef PYBUILD_PYTHON_MAJOR_VERSION
29- $(error PYBUILD_PYTHON_MAJOR_VERSION not defined)
30- endif
29+ PYTHON_MAJOR_VERSION := $(subst $(SPACE ) ,.,$(wordlist 1,2,$(subst .,$(SPACE ) ,$(PYBUILD_PYTHON_VERSION ) ) ) )
3130
3231TARGET_TRIPLE := $(PYBUILD_TARGET_TRIPLE )
3332HOST_PLATFORM := $(PYBUILD_HOST_PLATFORM )
4746
4847# Always write out settings files.
4948$(shell $(RUN_BUILD) placeholder_archive makefiles)
50- include $(OUTDIR ) /Makefile.$(HOST_PLATFORM ) .$(TARGET_TRIPLE ) .$(PYBUILD_PYTHON_MAJOR_VERSION )
49+ include $(OUTDIR ) /Makefile.$(HOST_PLATFORM ) .$(TARGET_TRIPLE ) .$(PYTHON_MAJOR_VERSION )
5150include $(OUTDIR ) /versions/VERSION.*
5251
5352# Always write out expanded Dockerfiles.
@@ -274,7 +273,7 @@ PYTHON_DEPENDS := \
274273 $(PYTHON_SUPPORT_FILES ) \
275274 $(OUTDIR ) /versions/VERSION.pip \
276275 $(OUTDIR ) /versions/VERSION.setuptools \
277- $(OUTDIR ) /cpython-$(PYBUILD_PYTHON_MAJOR_VERSION ) -$(PYBUILD_PYTHON_VERSION ) -$(HOST_PLATFORM ) .tar \
276+ $(OUTDIR ) /cpython-$(PYTHON_MAJOR_VERSION ) -$(PYBUILD_PYTHON_VERSION ) -$(HOST_PLATFORM ) .tar \
278277 $(if $(NEED_AUTOCONF ) ,$(OUTDIR ) /autoconf-$(AUTOCONF_VERSION ) -$(PACKAGE_SUFFIX ) .tar) \
279278 $(if $(NEED_BDB ) ,$(OUTDIR ) /bdb-$(BDB_VERSION ) -$(PACKAGE_SUFFIX ) .tar) \
280279 $(if $(NEED_BZIP2 ) ,$(OUTDIR ) /bzip2-$(BZIP2_VERSION ) -$(PACKAGE_SUFFIX ) .tar) \
0 commit comments