Skip to content

Commit

Permalink
Update musl to 1.1.24
Browse files Browse the repository at this point in the history
  • Loading branch information
tmiasko committed Jun 7, 2020
1 parent a2fc33e commit 9d01cd1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
10 changes: 6 additions & 4 deletions src/ci/docker/scripts/musl-toolchain.sh
Expand Up @@ -3,7 +3,7 @@
#
# Versions of the toolchain components are configurable in `musl-cross-make/Makefile` and
# musl unlike GLIBC is forward compatible so upgrading it shouldn't break old distributions.
# Right now we have: Binutils 2.27, GCC 6.4.0, musl 1.1.22.
# Right now we have: Binutils 2.31.1, GCC 9.2.0, musl 1.1.24.
set -ex

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

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

hide_output make -j$(nproc) TARGET=$TARGET
hide_output make install TARGET=$TARGET OUTPUT=$OUTPUT
hide_output make -j$(nproc) TARGET=$TARGET MUSL_VER=1.1.24
hide_output make install TARGET=$TARGET MUSL_VER=1.1.24 OUTPUT=$OUTPUT

cd -

Expand Down
2 changes: 1 addition & 1 deletion src/ci/docker/scripts/musl.sh
Expand Up @@ -24,7 +24,7 @@ shift
# Apparently applying `-fPIC` everywhere allows them to link successfully.
export CFLAGS="-fPIC $CFLAGS"

MUSL=musl-1.1.22
MUSL=musl-1.1.24

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

0 comments on commit 9d01cd1

Please sign in to comment.