Skip to content

Commit 3550651

Browse files
committed
linux: remove platfrom argument from copy_toolchain()
It isn't used. Might as well remove it.
1 parent 9811f1e commit 3550651

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

cpython-linux/build.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ def install_tools_archive(container, source: pathlib.Path):
176176
user='root')
177177

178178

179-
def copy_toolchain(container, platform=None, gcc=False):
179+
def copy_toolchain(container, gcc=False):
180180
install_tools_archive(container, BUILD / 'binutils-linux64.tar')
181181

182182
if gcc:
@@ -214,7 +214,7 @@ def simple_build(client, image, entry, platform):
214214
archive = download_entry(entry, BUILD)
215215

216216
with run_container(client, image) as container:
217-
copy_toolchain(container, platform=platform)
217+
copy_toolchain(container)
218218
copy_file_to_container(archive, container, '/build')
219219
copy_file_to_container(SUPPORT / ('build-%s.sh' % entry),
220220
container, '/build')
@@ -299,7 +299,6 @@ def build_clang(client, image):
299299
lld_archive, llvm_archive, libcxx_archive, libcxxabi_archive):
300300
copy_file_to_container(a, container, '/build')
301301

302-
toolchain_platform = None
303302
tools_path = 'clang-linux64'
304303
suffix = 'linux64'
305304
build_sh = 'build-clang.sh'
@@ -317,7 +316,7 @@ def build_clang(client, image):
317316
'LLVM_VERSION': DOWNLOADS['llvm']['version'],
318317
}
319318

320-
copy_toolchain(container, toolchain_platform, gcc=gcc)
319+
copy_toolchain(container, gcc=gcc)
321320

322321
copy_file_to_container(SUPPORT / build_sh, container,
323322
'/build')
@@ -351,7 +350,7 @@ def build_libedit(client, image, platform):
351350
libedit_archive = download_entry('libedit', BUILD)
352351

353352
with run_container(client, image) as container:
354-
copy_toolchain(container, platform=platform)
353+
copy_toolchain(container)
355354
install_tools_archive(container, BUILD / ('ncurses-%s.tar' % platform))
356355
copy_file_to_container(libedit_archive, container, '/build')
357356
copy_file_to_container(SUPPORT / 'build-libedit.sh', container,
@@ -373,7 +372,7 @@ def build_readline(client, image, platform):
373372
readline_archive = download_entry('readline', BUILD)
374373

375374
with run_container(client, image) as container:
376-
copy_toolchain(container, platform=platform)
375+
copy_toolchain(container)
377376
install_tools_archive(container, BUILD / ('ncurses-%s.tar' % platform))
378377
copy_file_to_container(readline_archive, container, '/build')
379378
copy_file_to_container(SUPPORT / 'build-readline.sh', container,
@@ -398,7 +397,7 @@ def build_tcltk(client, image, platform):
398397
x11_archive = download_entry('libx11', BUILD)
399398

400399
with run_container(client, image) as container:
401-
copy_toolchain(container, platform=platform)
400+
copy_toolchain(container)
402401

403402
copy_file_to_container(tcl_archive, container, '/build')
404403
copy_file_to_container(tk_archive, container, '/build')
@@ -600,7 +599,7 @@ def build_cpython(client, image, platform, optimized=False):
600599
extra_make_content = setup['make_data']
601600

602601
with run_container(client, image) as container:
603-
copy_toolchain(container, platform=platform)
602+
copy_toolchain(container)
604603
# TODO support bdb/gdbm toggle
605604
install_tools_archive(container, BUILD / ('bdb-%s.tar' % platform))
606605
install_tools_archive(container, BUILD / ('bzip2-%s.tar' % platform))

0 commit comments

Comments
 (0)