From 6de827e248e4494c97d2d9c514553e160ab8f768 Mon Sep 17 00:00:00 2001 From: Martell Malone Date: Tue, 25 Sep 2018 23:33:07 -0700 Subject: [PATCH 1/2] Add x86_64-unknown-linux-musl build support --- .travis.yml | 6 ++++++ README.md | 1 + ci/docker/x86_64-unknown-linux-musl/Dockerfile | 11 +++++++++++ 3 files changed, 18 insertions(+) create mode 100644 ci/docker/x86_64-unknown-linux-musl/Dockerfile diff --git a/.travis.yml b/.travis.yml index c695e9f5f1..db334f909b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,6 +90,12 @@ matrix: DOCKER=s390x-unknown-linux-gnu SKIP_TESTS=1 if: branch != master + - os: linux + env: TARGET=x86_64-unknown-linux-musl + DOCKER=x86_64-unknown-linux-musl + SKIP_TESTS=1 + if: branch != master + # Android use a local docker image - os: linux diff --git a/README.md b/README.md index 1b935d677b..5f403ca051 100644 --- a/README.md +++ b/README.md @@ -610,6 +610,7 @@ platform of your choice: - [x86_64-pc-windows-msvc](https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe)[†](#vs2015) - [x86_64-unknown-freebsd](https://static.rust-lang.org/rustup/dist/x86_64-unknown-freebsd/rustup-init) - [x86_64-unknown-linux-gnu](https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init) +- [x86_64-unknown-linux-musl](https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-musl/rustup-init) - [x86_64-unknown-netbsd](https://static.rust-lang.org/rustup/dist/x86_64-unknown-netbsd/rustup-init) † diff --git a/ci/docker/x86_64-unknown-linux-musl/Dockerfile b/ci/docker/x86_64-unknown-linux-musl/Dockerfile new file mode 100644 index 0000000000..9fefabf7db --- /dev/null +++ b/ci/docker/x86_64-unknown-linux-musl/Dockerfile @@ -0,0 +1,11 @@ +FROM alpine:3.8 + +RUN apk update && \ + apk add \ + curl \ + ca-certificates \ + perl \ + make \ + gcc + +ENV CC_x86_64_unknown_linux_musl=gcc From 54b50f5d2454a9ba86eb3230c1a20cd0b0937590 Mon Sep 17 00:00:00 2001 From: Jonathan Sieber Date: Wed, 17 Oct 2018 18:43:42 +0000 Subject: [PATCH 2/2] Change Dockerfile to Ubuntu with musl-tools, since we need glibc compatibility with host system --- ci/docker/x86_64-unknown-linux-musl/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/docker/x86_64-unknown-linux-musl/Dockerfile b/ci/docker/x86_64-unknown-linux-musl/Dockerfile index 9fefabf7db..72a3049254 100644 --- a/ci/docker/x86_64-unknown-linux-musl/Dockerfile +++ b/ci/docker/x86_64-unknown-linux-musl/Dockerfile @@ -1,11 +1,11 @@ -FROM alpine:3.8 +FROM ubuntu:16.04 -RUN apk update && \ - apk add \ +RUN apt-get update && apt-get install -y \ + musl-tools \ curl \ ca-certificates \ perl \ make \ gcc -ENV CC_x86_64_unknown_linux_musl=gcc +ENV CC_x86_64_unknown_linux_musl=musl-gcc