@@ -1101,7 +1101,7 @@ def build_openssl_for_arch(
1101
1101
openssl_version = DOWNLOADS ["openssl" ]["version" ]
1102
1102
nasm_version = DOWNLOADS ["nasm-windows-bin" ]["version" ]
1103
1103
jom_version = DOWNLOADS ["jom-windows-bin" ]["version" ]
1104
-
1104
+
1105
1105
log ("extracting %s to %s" % (openssl_archive , build_root ))
1106
1106
extract_tar_to_directory (openssl_archive , build_root )
1107
1107
log ("extracting %s to %s" % (nasm_archive , build_root ))
@@ -1111,7 +1111,7 @@ def build_openssl_for_arch(
1111
1111
1112
1112
nasm_path = build_root / ("cpython-bin-deps-nasm-%s" % nasm_version )
1113
1113
jom_path = build_root / "jom"
1114
-
1114
+
1115
1115
env = dict (os .environ )
1116
1116
# Add Perl and nasm paths to front of PATH.
1117
1117
env ["PATH" ] = "%s;%s;%s;%s" % (perl_path .parent , nasm_path , jom_path , env ["PATH" ])
@@ -1158,14 +1158,15 @@ def build_openssl_for_arch(
1158
1158
"--prefix=/%s" % prefix ,
1159
1159
],
1160
1160
source_root ,
1161
- {
1162
- ** env ,
1163
- 'CFLAGS' : env .get ('CFLAGS' , '' ) + ' /FS' ,
1164
- },
1161
+ {** env , "CFLAGS" : env .get ("CFLAGS" , "" ) + " /FS" ,},
1165
1162
)
1166
1163
1167
- #exec_and_log(["nmake"], source_root, env)
1168
- exec_and_log ([str (jom_path / "jom" ), "/J" , str (multiprocessing .cpu_count ())], source_root , env )
1164
+ # exec_and_log(["nmake"], source_root, env)
1165
+ exec_and_log (
1166
+ [str (jom_path / "jom" ), "/J" , str (multiprocessing .cpu_count ())],
1167
+ source_root ,
1168
+ env ,
1169
+ )
1169
1170
1170
1171
# We don't care about accessory files, docs, etc. So just run `install_sw`
1171
1172
# target to get the main files.
@@ -1197,12 +1198,24 @@ def build_openssl(perl_path: pathlib.Path, arch: str, profile: str):
1197
1198
if arch == "x86" :
1198
1199
root_32 .mkdir ()
1199
1200
build_openssl_for_arch (
1200
- perl_path , "x86" , openssl_archive , nasm_archive , root_32 , profile , jom_archive = jom_archive ,
1201
+ perl_path ,
1202
+ "x86" ,
1203
+ openssl_archive ,
1204
+ nasm_archive ,
1205
+ root_32 ,
1206
+ profile ,
1207
+ jom_archive = jom_archive ,
1201
1208
)
1202
1209
elif arch == "amd64" :
1203
1210
root_64 .mkdir ()
1204
1211
build_openssl_for_arch (
1205
- perl_path , "amd64" , openssl_archive , nasm_archive , root_64 , profile , jom_archive = jom_archive ,
1212
+ perl_path ,
1213
+ "amd64" ,
1214
+ openssl_archive ,
1215
+ nasm_archive ,
1216
+ root_64 ,
1217
+ profile ,
1218
+ jom_archive = jom_archive ,
1206
1219
)
1207
1220
else :
1208
1221
raise ValueError ("unhandled arch: %s" % arch )
@@ -1985,7 +1998,7 @@ def main():
1985
1998
1986
1999
LOG_PREFIX [0 ] = "cpython"
1987
2000
tar_path = build_cpython (
1988
- args .python , arch , sh_exe = pathlib .Path (args .sh ), profile = args .profile
2001
+ args .python , arch , sh_exe = pathlib .Path (args .sh ), profile = args .profile ,
1989
2002
)
1990
2003
1991
2004
compress_python_archive (
0 commit comments