Skip to content

Commit 21a0e33

Browse files
authored
Rollup merge of rust-lang#41089 - alexcrichton:update-musl, r=brson
travis: Update musl for i686/x86_64 This is a random stab towards rust-lang#38618, no idea if it'll work. But hey more up-to-date software is better, right?
2 parents cca7dd1 + 631f761 commit 21a0e33

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/ci/docker/dist-i586-gnu-i686-musl/build-musl.sh

+6-3
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,14 @@ set -ex
1515
export CFLAGS="-fPIC -Wa,-mrelax-relocations=no"
1616
export CXXFLAGS="-Wa,-mrelax-relocations=no"
1717

18-
MUSL=musl-1.1.14
18+
MUSL=musl-1.1.16
1919
curl https://www.musl-libc.org/releases/$MUSL.tar.gz | tar xzf -
2020
cd $MUSL
21-
CFLAGS="$CFLAGS -m32" ./configure --prefix=/musl-i686 --disable-shared --target=i686
22-
make -j10
21+
CC=gcc \
22+
CFLAGS="$CFLAGS -m32" \
23+
./configure --prefix=/musl-i686 --disable-shared \
24+
--target=i686
25+
make AR=ar RANLIB=ranlib -j10
2326
make install
2427
cd ..
2528

src/ci/docker/dist-x86_64-musl/build-musl.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ set -ex
1515
export CFLAGS="-fPIC -Wa,-mrelax-relocations=no"
1616
export CXXFLAGS="-Wa,-mrelax-relocations=no"
1717

18-
MUSL=musl-1.1.14
18+
MUSL=musl-1.1.16
1919
curl https://www.musl-libc.org/releases/$MUSL.tar.gz | tar xzf -
2020
cd $MUSL
2121
./configure --prefix=/musl-x86_64 --disable-shared

0 commit comments

Comments
 (0)