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 /src/ci/docker/scripts | |
| parent | 66de5c6e90ff3975bcef01de90bac82a8e92fc8f (diff) | |
| download | rust-17464a7b877c83cb506ccac33347a6c777b78159.tar.gz rust-17464a7b877c83cb506ccac33347a6c777b78159.zip | |
Final cleanups
Diffstat (limited to 'src/ci/docker/scripts')
| -rw-r--r-- | src/ci/docker/scripts/musl-toolchain.sh | 10 |
1 files changed, 4 insertions, 6 deletions
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 \ |