@@ -4,6 +4,7 @@ OUTDIR := $(ROOT)/build
4
4
5
5
BUILD := $(HERE ) /build.py
6
6
NULL :=
7
+ SPACE := $(subst ,, )
7
8
8
9
ifndef PYBUILD_TARGET_TRIPLE
9
10
$(error PYBUILD_TARGET_TRIPLE not defined)
@@ -25,9 +26,7 @@ ifndef PYBUILD_PYTHON_VERSION
25
26
$(error PYBUILD_PYTHON_VERSION not defined)
26
27
endif
27
28
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 ) ) ) )
31
30
32
31
TARGET_TRIPLE := $(PYBUILD_TARGET_TRIPLE )
33
32
HOST_PLATFORM := $(PYBUILD_HOST_PLATFORM )
47
46
48
47
# Always write out settings files.
49
48
$(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 )
51
50
include $(OUTDIR ) /versions/VERSION.*
52
51
53
52
# Always write out expanded Dockerfiles.
@@ -274,7 +273,7 @@ PYTHON_DEPENDS := \
274
273
$(PYTHON_SUPPORT_FILES ) \
275
274
$(OUTDIR ) /versions/VERSION.pip \
276
275
$(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 \
278
277
$(if $(NEED_AUTOCONF ) ,$(OUTDIR ) /autoconf-$(AUTOCONF_VERSION ) -$(PACKAGE_SUFFIX ) .tar) \
279
278
$(if $(NEED_BDB ) ,$(OUTDIR ) /bdb-$(BDB_VERSION ) -$(PACKAGE_SUFFIX ) .tar) \
280
279
$(if $(NEED_BZIP2 ) ,$(OUTDIR ) /bzip2-$(BZIP2_VERSION ) -$(PACKAGE_SUFFIX ) .tar) \
0 commit comments