Skip to content

Commit 5b5a953

Browse files
committed
linux: build musl with Clang
We build everything else with Clang. And musl's configure looks at the invoking compiler to see which wrapper scripts to install. So we need to compile with clang to get those wrapper scripts installed.
1 parent 3550651 commit 5b5a953

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

cpython-linux/build-musl.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ set -e
77

88
cd /build
99

10+
export PATH=/tools/${TOOLCHAIN}/bin:/tools/host/bin:$PATH
11+
export CC=clang
12+
1013
tar -xf musl-${MUSL_VERSION}.tar.gz
1114

1215
pushd musl-${MUSL_VERSION}

cpython-linux/build.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,11 +332,13 @@ def build_musl(client, image):
332332
musl_archive = download_entry('musl', BUILD)
333333

334334
with run_container(client, image) as container:
335+
copy_toolchain(container)
335336
copy_file_to_container(musl_archive, container, '/build')
336337
copy_file_to_container(SUPPORT / 'build-musl.sh', container, '/build')
337338

338339
env = {
339340
'MUSL_VERSION': DOWNLOADS['musl']['version'],
341+
'TOOLCHAIN': 'clang-linux64',
340342
}
341343

342344
container_exec(container, '/build/build-musl.sh',

0 commit comments

Comments
 (0)