Skip to content

Commit 9d01cd1

Browse files
committed
Update musl to 1.1.24
1 parent a2fc33e commit 9d01cd1

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/ci/docker/scripts/musl-toolchain.sh

+6-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Versions of the toolchain components are configurable in `musl-cross-make/Makefile` and
55
# musl unlike GLIBC is forward compatible so upgrading it shouldn't break old distributions.
6-
# Right now we have: Binutils 2.27, GCC 6.4.0, musl 1.1.22.
6+
# Right now we have: Binutils 2.31.1, GCC 9.2.0, musl 1.1.24.
77
set -ex
88

99
hide_output() {
@@ -33,11 +33,13 @@ shift
3333
# Apparently applying `-fPIC` everywhere allows them to link successfully.
3434
export CFLAGS="-fPIC $CFLAGS"
3535

36-
git clone https://github.com/richfelker/musl-cross-make -b v0.9.8
36+
git clone https://github.com/richfelker/musl-cross-make # -b v0.9.9
3737
cd musl-cross-make
38+
# A few commits ahead of v0.9.9 to include the cowpatch fix:
39+
git checkout a54eb56f33f255dfca60be045f12a5cfaf5a72a9
3840

39-
hide_output make -j$(nproc) TARGET=$TARGET
40-
hide_output make install TARGET=$TARGET OUTPUT=$OUTPUT
41+
hide_output make -j$(nproc) TARGET=$TARGET MUSL_VER=1.1.24
42+
hide_output make install TARGET=$TARGET MUSL_VER=1.1.24 OUTPUT=$OUTPUT
4143

4244
cd -
4345

src/ci/docker/scripts/musl.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ shift
2424
# Apparently applying `-fPIC` everywhere allows them to link successfully.
2525
export CFLAGS="-fPIC $CFLAGS"
2626

27-
MUSL=musl-1.1.22
27+
MUSL=musl-1.1.24
2828

2929
# may have been downloaded in a previous run
3030
if [ ! -d $MUSL ]; then

0 commit comments

Comments
 (0)