diff options
| author | Pankaj Chaudhary <pankajchaudhary172@gmail.com> | 2020-07-13 14:14:37 +0530 |
|---|---|---|
| committer | PankajChaudhary5 <pankajchaudhary172@gmail.com> | 2020-07-13 14:57:22 +0530 |
| commit | bc2b37aad7f9cbd1c97e416e6b16325b607422b8 (patch) | |
| tree | 867a6176bcf763bba6e5de12bc08f034a320ac56 /src/ci/docker/scripts | |
| parent | e3ae4c7345cfd06b06c6996536d7c158ce6970db (diff) | |
| parent | 9d09331e00b02f81c714b0c41ce3a38380dd36a2 (diff) | |
| download | rust-bc2b37aad7f9cbd1c97e416e6b16325b607422b8.tar.gz rust-bc2b37aad7f9cbd1c97e416e6b16325b607422b8.zip | |
Merge branch 'master' into E0688
Diffstat (limited to 'src/ci/docker/scripts')
| -rw-r--r-- | src/ci/docker/scripts/musl-toolchain.sh | 10 | ||||
| -rw-r--r-- | src/ci/docker/scripts/musl.sh | 2 | ||||
| -rw-r--r-- | src/ci/docker/scripts/sccache.sh | 14 |
3 files changed, 19 insertions, 7 deletions
diff --git a/src/ci/docker/scripts/musl-toolchain.sh b/src/ci/docker/scripts/musl-toolchain.sh index 74ba2f0eadb..1ae412340cb 100644 --- a/src/ci/docker/scripts/musl-toolchain.sh +++ b/src/ci/docker/scripts/musl-toolchain.sh @@ -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() { @@ -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 - diff --git a/src/ci/docker/scripts/musl.sh b/src/ci/docker/scripts/musl.sh index d847c407aba..58393a5719a 100644 --- a/src/ci/docker/scripts/musl.sh +++ b/src/ci/docker/scripts/musl.sh @@ -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 diff --git a/src/ci/docker/scripts/sccache.sh b/src/ci/docker/scripts/sccache.sh index 552afbfee7c..cebba57344b 100644 --- a/src/ci/docker/scripts/sccache.sh +++ b/src/ci/docker/scripts/sccache.sh @@ -1,6 +1,16 @@ set -ex -curl -fo /usr/local/bin/sccache \ - https://ci-mirrors.rust-lang.org/rustc/2018-04-02-sccache-x86_64-unknown-linux-musl +case "$(uname -m)" in + x86_64) + url="https://ci-mirrors.rust-lang.org/rustc/2018-04-02-sccache-x86_64-unknown-linux-musl" + ;; + aarch64) + url="https://ci-mirrors.rust-lang.org/rustc/2019-12-17-sccache-aarch64-unknown-linux-gnu" + ;; + *) + echo "unsupported architecture: $(uname -m)" + exit 1 +esac +curl -fo /usr/local/bin/sccache "${url}" chmod +x /usr/local/bin/sccache |