Skip to content

Commit eddc2d0

Browse files
committed
windows: don't use futures to build openssl
We no longer attempt to build both 32 and 64 bit versions of OpenSSL at the same time. There is no need for futures.
1 parent e83fe0b commit eddc2d0

File tree

1 file changed

+11
-18
lines changed

1 file changed

+11
-18
lines changed

cpython-windows/build.py

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,24 +1018,17 @@ def build_openssl(perl_path: pathlib.Path, arch: str):
10181018

10191019
root_32 = td / 'x86'
10201020
root_64 = td / 'x64'
1021-
root_32.mkdir()
1022-
root_64.mkdir()
1023-
1024-
# Then build the 32 and 64 bit OpenSSL installs in parallel
1025-
# (because nmake doesn't do parallel builds).
1026-
fs = []
1027-
with concurrent.futures.ThreadPoolExecutor(2) as e:
1028-
if arch == 'x86':
1029-
fs.append(e.submit(build_openssl_for_arch, perl_path, 'x86',
1030-
openssl_archive, nasm_archive, root_32))
1031-
elif arch == 'amd64':
1032-
fs.append(e.submit(build_openssl_for_arch, perl_path, 'amd64',
1033-
openssl_archive, nasm_archive, root_64))
1034-
else:
1035-
raise ValueError('unhandled arch: %s' % arch)
1036-
1037-
for f in fs:
1038-
f.result()
1021+
1022+
if arch == 'x86':
1023+
root_32.mkdir()
1024+
build_openssl_for_arch(perl_path, 'x86', openssl_archive,
1025+
nasm_archive, root_32)
1026+
elif arch == 'amd64':
1027+
root_64.mkdir()
1028+
build_openssl_for_arch(perl_path, 'amd64', openssl_archive,
1029+
nasm_archive, root_64)
1030+
else:
1031+
raise ValueError('unhandled arch: %s' % arch)
10391032

10401033
install = td / 'out'
10411034

0 commit comments

Comments
 (0)