@@ -1190,6 +1190,7 @@ def build_openssl(perl_path: pathlib.Path, arch: str, profile: str):
1190
1190
def collect_python_build_artifacts (
1191
1191
pcbuild_path : pathlib .Path ,
1192
1192
out_dir : pathlib .Path ,
1193
+ python_majmin : str ,
1193
1194
arch : str ,
1194
1195
config : str ,
1195
1196
static : bool ,
@@ -1200,7 +1201,9 @@ def collect_python_build_artifacts(
1200
1201
the files.
1201
1202
"""
1202
1203
outputs_path = pcbuild_path / arch
1203
- intermediates_path = pcbuild_path / "obj" / ("37%s_%s" % (arch , config ))
1204
+ intermediates_path = (
1205
+ pcbuild_path / "obj" / ("%s%s_%s" % (python_majmin , arch , config ))
1206
+ )
1204
1207
1205
1208
if not outputs_path .exists ():
1206
1209
log ("%s does not exist" % outputs_path )
@@ -1331,15 +1334,15 @@ def find_additional_dependencies(project: pathlib.Path):
1331
1334
exts = ("lib" , "exp" )
1332
1335
1333
1336
for ext in exts :
1334
- source = outputs_path / ("python37 .%s" % ext )
1335
- dest = core_dir / ("python37 .%s" % ext )
1337
+ source = outputs_path / ("python%s .%s" % ( python_majmin , ext ) )
1338
+ dest = core_dir / ("python%s .%s" % ( python_majmin , ext ) )
1336
1339
log ("copying %s" % source )
1337
1340
shutil .copyfile (source , dest )
1338
1341
1339
1342
if static :
1340
- res ["core" ]["static_lib" ] = "build/core/python37 .lib"
1343
+ res ["core" ]["static_lib" ] = "build/core/python%s .lib" % python_majmin
1341
1344
else :
1342
- res ["core" ]["shared_lib" ] = "install/python37 .dll"
1345
+ res ["core" ]["shared_lib" ] = "install/python%s .dll" % python_majmin
1343
1346
1344
1347
# We hack up pythoncore.vcxproj and the list in it when this function
1345
1348
# runs isn't totally accurate. We hardcode the list from the CPython
@@ -1707,6 +1710,7 @@ def build_cpython(python_entry_name: str, arch: str, profile):
1707
1710
build_info = collect_python_build_artifacts (
1708
1711
pcbuild_path ,
1709
1712
out_dir / "python" ,
1713
+ "" .join (entry ["version" ].split ("." )[0 :2 ]),
1710
1714
build_directory ,
1711
1715
artifact_config ,
1712
1716
static = static ,
0 commit comments