diff options
| author | Mateusz Mikuła <matti@marinelayer.io> | 2019-03-14 16:55:47 +0100 |
|---|---|---|
| committer | Mateusz Mikuła <mati865@gmail.com> | 2019-03-14 16:55:47 +0100 |
| commit | f364f483a3d79248b2b6b576097e27ffdacfe38e (patch) | |
| tree | cee7ac36bcc158440f8e984cce80039ed161d632 | |
| parent | 17464a7b877c83cb506ccac33347a6c777b78159 (diff) | |
| download | rust-f364f483a3d79248b2b6b576097e27ffdacfe38e.tar.gz rust-f364f483a3d79248b2b6b576097e27ffdacfe38e.zip | |
Address final review
| -rw-r--r-- | src/ci/docker/scripts/musl-toolchain.sh | 6 | ||||
| -rw-r--r-- | src/ci/docker/test-various/Dockerfile | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/ci/docker/scripts/musl-toolchain.sh b/src/ci/docker/scripts/musl-toolchain.sh index 7802e15f188..e168760f449 100644 --- a/src/ci/docker/scripts/musl-toolchain.sh +++ b/src/ci/docker/scripts/musl-toolchain.sh @@ -1,3 +1,9 @@ +# This script runs `musl-cross-make` to prepare C toolchain (Binutils, GCC, musl itself) +# and builds static libunwind that we distribute for static target. +# +# 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.3.0, musl 1.1.18 set -ex hide_output() { diff --git a/src/ci/docker/test-various/Dockerfile b/src/ci/docker/test-various/Dockerfile index 80c6ed68cb5..60b431ad386 100644 --- a/src/ci/docker/test-various/Dockerfile +++ b/src/ci/docker/test-various/Dockerfile @@ -12,7 +12,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ sudo \ gdb \ xz-utils \ - # for musl wget \ patch @@ -25,9 +24,7 @@ RUN curl -sL https://nodejs.org/dist/v9.2.0/node-v9.2.0-linux-x64.tar.xz | \ WORKDIR /build/ COPY scripts/musl-toolchain.sh /build/ -RUN CFLAGS="-Wa,-mrelax-relocations=no" \ - CXXFLAGS="-Wa,-mrelax-relocations=no" \ - bash musl-toolchain.sh x86_64 && rm -rf build +RUN bash musl-toolchain.sh x86_64 && rm -rf build WORKDIR / COPY scripts/sccache.sh /scripts/ |