diff options
| author | Mateusz Mikuła <matti@marinelayer.io> | 2019-03-13 22:18:13 +0100 |
|---|---|---|
| committer | Mateusz Mikuła <mati865@gmail.com> | 2019-03-13 22:36:22 +0100 |
| commit | 17464a7b877c83cb506ccac33347a6c777b78159 (patch) | |
| tree | f3e981cdf14fa1d00bed43aa83339b14f2b930e4 | |
| parent | 66de5c6e90ff3975bcef01de90bac82a8e92fc8f (diff) | |
| download | rust-17464a7b877c83cb506ccac33347a6c777b78159.tar.gz rust-17464a7b877c83cb506ccac33347a6c777b78159.zip | |
Final cleanups
| -rw-r--r-- | src/ci/docker/dist-x86_64-musl/Dockerfile | 8 | ||||
| -rw-r--r-- | src/ci/docker/scripts/musl-toolchain.sh | 10 | ||||
| -rw-r--r-- | src/ci/docker/test-various/Dockerfile | 2 |
3 files changed, 8 insertions, 12 deletions
diff --git a/src/ci/docker/dist-x86_64-musl/Dockerfile b/src/ci/docker/dist-x86_64-musl/Dockerfile index 543b9377357..560df2f3a57 100644 --- a/src/ci/docker/dist-x86_64-musl/Dockerfile +++ b/src/ci/docker/dist-x86_64-musl/Dockerfile @@ -21,10 +21,9 @@ WORKDIR /build/ COPY scripts/musl-toolchain.sh /build/ # We need to mitigate rust-lang/rust#34978 when compiling musl itself as well -# TODO: Check what this issue is and if we can ignore it RUN CFLAGS="-Wa,-mrelax-relocations=no" \ CXXFLAGS="-Wa,-mrelax-relocations=no" \ - bash musl-toolchain.sh x86_64-linux-musl && rm -rf build + bash musl-toolchain.sh x86_64 && rm -rf build COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh @@ -45,9 +44,8 @@ ENV HOSTS=x86_64-unknown-linux-musl \ CC_x86_64_unknown_linux_musl=x86_64-linux-musl-gcc \ CXX_x86_64_unknown_linux_musl=x86_64-linux-musl-g++ -# CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABIHF_LINKER=musl-gcc \ -# CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABIHF_RUNNER="qemu-arm -L /musl-arm" - +# Musl defaults to static libs but we need them to be dynamic for host toolchain. +# The toolchain will produce static libs by default. ENV RUSTFLAGS="-C target-feature=-crt-static" ENV SCRIPT python2.7 ../x.py dist --host $HOSTS --target $HOSTS diff --git a/src/ci/docker/scripts/musl-toolchain.sh b/src/ci/docker/scripts/musl-toolchain.sh index 00b6a113da1..7802e15f188 100644 --- a/src/ci/docker/scripts/musl-toolchain.sh +++ b/src/ci/docker/scripts/musl-toolchain.sh @@ -17,10 +17,8 @@ exit 1 set -x } -TARGET=$1 -#ARCH=$1 -#TARGET=linux-musl-$ARCH -ARCH=x86_64 +ARCH=$1 +TARGET=linux-musl-$ARCH OUTPUT=/usr/local shift @@ -33,8 +31,7 @@ hide_output make install TARGET=$TARGET OUTPUT=$OUTPUT cd - -# Make musl binaries executable - +# Install musl library to make binaries executable ln -s $OUTPUT/$TARGET/lib/libc.so /lib/ld-musl-$ARCH.so.1 echo $OUTPUT/$TARGET/lib >> /etc/ld-musl-$ARCH.path @@ -50,6 +47,7 @@ if [ ! -d libunwind-release_$LLVM ]; then curl -L https://github.com/llvm-mirror/libunwind/archive/release_$LLVM.tar.gz | tar xzf - fi +# fixme(mati865): Replace it with https://github.com/rust-lang/rust/pull/59089 mkdir libunwind-build cd libunwind-build cmake ../libunwind-release_$LLVM \ diff --git a/src/ci/docker/test-various/Dockerfile b/src/ci/docker/test-various/Dockerfile index f70ea9da92e..80c6ed68cb5 100644 --- a/src/ci/docker/test-various/Dockerfile +++ b/src/ci/docker/test-various/Dockerfile @@ -27,7 +27,7 @@ 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-linux-musl && rm -rf build + bash musl-toolchain.sh x86_64 && rm -rf build WORKDIR / COPY scripts/sccache.sh /scripts/ |