diff options
author | bors <bors@rust-lang.org> | 2021-02-28 04:14:47 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2021-02-28 04:14:47 +0000 |
commit | 5fd6540db9b14fae02ff8a11a6102ee99965ae30 (patch) | |
tree | 6f1361fb02402747ef6a70349726fc46ed71b054 /ci/docker | |
parent | 1524495dcf85e1f806835a5223dbe10cc15586db (diff) | |
parent | 41cda2abdc6cf000ec4f4faf7dde727a95a45beb (diff) | |
download | rust-libc-5fd6540db9b14fae02ff8a11a6102ee99965ae30.tar.gz |
Auto merge of #2071 - kaniini:s390x-musl, r=Amanieu
add definitions for s390x musl targets
Add support for s390x musl targets to libc.
I haven't added CI because I am not familiar with the pipelines, but would be glad to do so if somebody outlines what needs to be done.
Diffstat (limited to 'ci/docker')
-rw-r--r-- | ci/docker/s390x-unknown-linux-musl/Dockerfile | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/ci/docker/s390x-unknown-linux-musl/Dockerfile b/ci/docker/s390x-unknown-linux-musl/Dockerfile new file mode 100644 index 0000000000..f83ee8c9c8 --- /dev/null +++ b/ci/docker/s390x-unknown-linux-musl/Dockerfile @@ -0,0 +1,17 @@ +FROM ubuntu:20.04 + +RUN apt-get update && apt-get install -y --no-install-recommends \ + curl ca-certificates \ + gcc \ + gcc-s390x-linux-gnu \ + qemu-user + +COPY install-musl.sh / +RUN sh /install-musl.sh s390x + +# FIXME: shouldn't need the `-lgcc` here, shouldn't that be in libstd? +ENV CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-linux-gnu-gcc \ + CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_RUNNER="qemu-s390x -L /musl-s390x" \ + CC_s390x_unknown_linux_gnu=musl-gcc \ + RUSTFLAGS='-Clink-args=-lgcc' \ + PATH=$PATH:/musl-s390x/bin:/rust/bin |