@@ -176,7 +176,7 @@ def install_tools_archive(container, source: pathlib.Path):
176
176
user = 'root' )
177
177
178
178
179
- def copy_toolchain (container , platform = None , gcc = False ):
179
+ def copy_toolchain (container , gcc = False ):
180
180
install_tools_archive (container , BUILD / 'binutils-linux64.tar' )
181
181
182
182
if gcc :
@@ -214,7 +214,7 @@ def simple_build(client, image, entry, platform):
214
214
archive = download_entry (entry , BUILD )
215
215
216
216
with run_container (client , image ) as container :
217
- copy_toolchain (container , platform = platform )
217
+ copy_toolchain (container )
218
218
copy_file_to_container (archive , container , '/build' )
219
219
copy_file_to_container (SUPPORT / ('build-%s.sh' % entry ),
220
220
container , '/build' )
@@ -299,7 +299,6 @@ def build_clang(client, image):
299
299
lld_archive , llvm_archive , libcxx_archive , libcxxabi_archive ):
300
300
copy_file_to_container (a , container , '/build' )
301
301
302
- toolchain_platform = None
303
302
tools_path = 'clang-linux64'
304
303
suffix = 'linux64'
305
304
build_sh = 'build-clang.sh'
@@ -317,7 +316,7 @@ def build_clang(client, image):
317
316
'LLVM_VERSION' : DOWNLOADS ['llvm' ]['version' ],
318
317
}
319
318
320
- copy_toolchain (container , toolchain_platform , gcc = gcc )
319
+ copy_toolchain (container , gcc = gcc )
321
320
322
321
copy_file_to_container (SUPPORT / build_sh , container ,
323
322
'/build' )
@@ -351,7 +350,7 @@ def build_libedit(client, image, platform):
351
350
libedit_archive = download_entry ('libedit' , BUILD )
352
351
353
352
with run_container (client , image ) as container :
354
- copy_toolchain (container , platform = platform )
353
+ copy_toolchain (container )
355
354
install_tools_archive (container , BUILD / ('ncurses-%s.tar' % platform ))
356
355
copy_file_to_container (libedit_archive , container , '/build' )
357
356
copy_file_to_container (SUPPORT / 'build-libedit.sh' , container ,
@@ -373,7 +372,7 @@ def build_readline(client, image, platform):
373
372
readline_archive = download_entry ('readline' , BUILD )
374
373
375
374
with run_container (client , image ) as container :
376
- copy_toolchain (container , platform = platform )
375
+ copy_toolchain (container )
377
376
install_tools_archive (container , BUILD / ('ncurses-%s.tar' % platform ))
378
377
copy_file_to_container (readline_archive , container , '/build' )
379
378
copy_file_to_container (SUPPORT / 'build-readline.sh' , container ,
@@ -398,7 +397,7 @@ def build_tcltk(client, image, platform):
398
397
x11_archive = download_entry ('libx11' , BUILD )
399
398
400
399
with run_container (client , image ) as container :
401
- copy_toolchain (container , platform = platform )
400
+ copy_toolchain (container )
402
401
403
402
copy_file_to_container (tcl_archive , container , '/build' )
404
403
copy_file_to_container (tk_archive , container , '/build' )
@@ -600,7 +599,7 @@ def build_cpython(client, image, platform, optimized=False):
600
599
extra_make_content = setup ['make_data' ]
601
600
602
601
with run_container (client , image ) as container :
603
- copy_toolchain (container , platform = platform )
602
+ copy_toolchain (container )
604
603
# TODO support bdb/gdbm toggle
605
604
install_tools_archive (container , BUILD / ('bdb-%s.tar' % platform ))
606
605
install_tools_archive (container , BUILD / ('bzip2-%s.tar' % platform ))
0 commit comments