diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-04-05 10:39:02 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-04-05 11:10:48 -0700 |
| commit | 631f761f18d6e4e8d1d4eccaa622ee7defbb8ca4 (patch) | |
| tree | e83f274636bf845d8c333d69b06d1d5f75ef9fff /src | |
| parent | ad5dfecc6ae23bb7d2b8075d705011918ab4f399 (diff) | |
| download | rust-631f761f18d6e4e8d1d4eccaa622ee7defbb8ca4.tar.gz rust-631f761f18d6e4e8d1d4eccaa622ee7defbb8ca4.zip | |
travis: Update musl for i686/x86_64
This is a random stab towards #38618, no idea if it'll work. But hey more up-to-date software is better, right?
Diffstat (limited to 'src')
| -rw-r--r-- | src/ci/docker/dist-i586-gnu-i686-musl/build-musl.sh | 9 | ||||
| -rw-r--r-- | src/ci/docker/dist-x86_64-musl/build-musl.sh | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/ci/docker/dist-i586-gnu-i686-musl/build-musl.sh b/src/ci/docker/dist-i586-gnu-i686-musl/build-musl.sh index a50a25c7913..ad285a57a84 100644 --- a/src/ci/docker/dist-i586-gnu-i686-musl/build-musl.sh +++ b/src/ci/docker/dist-i586-gnu-i686-musl/build-musl.sh @@ -15,11 +15,14 @@ set -ex export CFLAGS="-fPIC -Wa,-mrelax-relocations=no" export CXXFLAGS="-Wa,-mrelax-relocations=no" -MUSL=musl-1.1.14 +MUSL=musl-1.1.16 curl https://www.musl-libc.org/releases/$MUSL.tar.gz | tar xzf - cd $MUSL -CFLAGS="$CFLAGS -m32" ./configure --prefix=/musl-i686 --disable-shared --target=i686 -make -j10 +CC=gcc \ + CFLAGS="$CFLAGS -m32" \ + ./configure --prefix=/musl-i686 --disable-shared \ + --target=i686 +make AR=ar RANLIB=ranlib -j10 make install cd .. diff --git a/src/ci/docker/dist-x86_64-musl/build-musl.sh b/src/ci/docker/dist-x86_64-musl/build-musl.sh index 86bb259c854..776da009397 100644 --- a/src/ci/docker/dist-x86_64-musl/build-musl.sh +++ b/src/ci/docker/dist-x86_64-musl/build-musl.sh @@ -15,7 +15,7 @@ set -ex export CFLAGS="-fPIC -Wa,-mrelax-relocations=no" export CXXFLAGS="-Wa,-mrelax-relocations=no" -MUSL=musl-1.1.14 +MUSL=musl-1.1.16 curl https://www.musl-libc.org/releases/$MUSL.tar.gz | tar xzf - cd $MUSL ./configure --prefix=/musl-x86_64 --disable-shared |