Skip to content

Bump musl libc and gcc version for *-musl targets #1799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dirreke wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bump musl libc and gcc version for *-musl targets #1799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
145 changes: 77 additions & 68 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,73 +200,81 @@ QEMU gets upset when you spawn multiple threads. This means that, if one of your
unit tests spawns threads, then it's more likely to fail or, worst, never
terminate.

| Target | libc | GCC | C++ | QEMU | `test` |
|----------------------------------------|-------:|-------:|:---:|------:|:------:|
| `aarch64-linux-android` [1] | 9.0.8 | 9.0.8 | ✓ | 6.1.0 | ✓ |
| `aarch64-unknown-linux-gnu` | 2.31 | 9.4.0 | ✓ | 6.1.0 | ✓ |
| `aarch64-unknown-linux-gnu:centos` [7] | 2.17 | 4.8.5 | | 4.2.1 | ✓ |
| `aarch64-unknown-linux-musl` | 1.2.3 | 9.2.0 | ✓ | 6.1.0 | ✓ |
| `aarch64_be-unknown-linux-gnu` | 2.36 | 14.2.0 | ✓ | 6.1.0 | ✓ |
| `arm-linux-androideabi` [1] | 9.0.8 | 9.0.8 | ✓ | 6.1.0 | ✓ |
| `arm-unknown-linux-gnueabi` | 2.31 | 9.4.0 | ✓ | 6.1.0 | ✓ |
| `arm-unknown-linux-gnueabihf` | 2.31 | 8.5.0 | ✓ | 6.1.0 | ✓ |
| `arm-unknown-linux-musleabi` | 1.2.3 | 9.2.0 | ✓ | 6.1.0 | ✓ |
| `arm-unknown-linux-musleabihf` | 1.2.3 | 9.2.0 | ✓ | 6.1.0 | ✓ |
| `armv5te-unknown-linux-gnueabi` | 2.31 | 9.4.0 | ✓ | 6.1.0 | ✓ |
| `armv5te-unknown-linux-musleabi` | 1.2.3 | 9.2.0 | ✓ | 6.1.0 | ✓ |
| `armv7-linux-androideabi` [1] | 9.0.8 | 9.0.8 | ✓ | 6.1.0 | ✓ |
| `armv7-unknown-linux-gnueabi` | 2.31 | 9.4.0 | ✓ | 6.1.0 | ✓ |
| `armv7-unknown-linux-gnueabihf` | 2.31 | 9.4.0 | ✓ | 6.1.0 | ✓ |
| `armv7-unknown-linux-musleabi` | 1.2.3 | 9.2.0 | ✓ | 6.1.0 | ✓ |
| `armv7-unknown-linux-musleabihf` | 1.2.3 | 9.2.0 | ✓ | 6.1.0 | ✓ |
| `i586-unknown-linux-gnu` | 2.31 | 9.4.0 | ✓ | N/A | ✓ |
| `i586-unknown-linux-musl` | 1.2.3 | 9.2.0 | ✓ | N/A | ✓ |
| `i686-unknown-freebsd` | 1.6 | 13.3.0 | ✓ | N/A | |
| `i686-linux-android` [1] | 9.0.8 | 9.0.8 | ✓ | 6.1.0 | ✓ |
| `i686-pc-windows-gnu` | N/A | 9.4 | ✓ | N/A | ✓ |
| `i686-unknown-linux-gnu` | 2.31 | 9.4.0 | ✓ | 6.1.0 | ✓ |
| `loongarch64-unknown-linux-gnu` | 2.36 | 14.2.0 | ✓ | 8.2.2 | ✓ |
| `loongarch64-unknown-linux-musl` | 1.2.5 | 14.2.0 | ✓ | 8.2.2 | ✓ |
| `mips-unknown-linux-gnu` | 2.30 | 9.4.0 | ✓ | 6.1.0 | ✓ |
| `mips-unknown-linux-musl` | 1.2.3 | 9.2.0 | ✓ | 6.1.0 | ✓ |
| `mips64-unknown-linux-gnuabi64` | 2.30 | 9.4.0 | ✓ | 6.1.0 | ✓ |
| `mips64-unknown-linux-muslabi64` | 1.2.3 | 9.2.0 | ✓ | 6.1.0 | ✓ |
| `mips64el-unknown-linux-gnuabi64` | 2.30 | 9.4.0 | ✓ | 6.1.0 | ✓ |
| `mips64el-unknown-linux-muslabi64` | 1.2.3 | 9.2.0 | ✓ | 6.1.0 | ✓ |
| `mipsel-unknown-linux-gnu` | 2.30 | 9.4.0 | ✓ | 6.1.0 | ✓ |
| `mipsel-unknown-linux-musl` | 1.2.3 | 9.2.0 | ✓ | 6.1.0 | ✓ |
| `powerpc-unknown-linux-gnu` | 2.31 | 9.4.0 | ✓ | 6.1.0 | ✓ |
| `powerpc64-unknown-linux-gnu` | 2.31 | 9.4.0 | ✓ | 6.1.0 | ✓ |
| `powerpc64le-unknown-linux-gnu` | 2.31 | 9.4.0 | ✓ | 6.1.0 | ✓ |
| `riscv64gc-unknown-linux-gnu` | 2.35 | 11.4.0 | ✓ | 8.2.2 | ✓ |
| `riscv64gc-unknown-linux-musl` | 1.2.5 | 14.2.0 | ✓ | 8.2.2 | ✓ |
| `s390x-unknown-linux-gnu` | 2.31 | 9.4.0 | ✓ | 6.1.0 | ✓ |
| `sparc64-unknown-linux-gnu` | 2.31 | 9.4.0 | ✓ | 6.1.0 | ✓ |
| `sparcv9-sun-solaris` | 1.22.7 | 8.4.0 | ✓ | N/A | |
| `thumbv6m-none-eabi` [4] | 3.3.0 | 9.2.1 | | N/A | |
| `thumbv7em-none-eabi` [4] | 3.3.0 | 9.2.1 | | N/A | |
| `thumbv7em-none-eabihf` [4] | 3.3.0 | 9.2.1 | | N/A | |
| `thumbv7m-none-eabi` [4] | 3.3.0 | 9.2.1 | | N/A | |
| `thumbv7neon-linux-androideabi` [1] | 9.0.8 | 9.0.8 | ✓ | 6.1.0 | ✓ |
| `thumbv7neon-unknown-linux-gnueabihf` | 2.31 | 9.4.0 | ✓ | N/A | ✓ |
| `thumbv8m.base-none-eabi` [4] | 3.3.0 | 9.2.1 | | N/A | |
| `thumbv8m.main-none-eabi` [4] | 3.3.0 | 9.2.1 | | N/A | |
| `thumbv8m.main-none-eabihf` [4] | 3.3.0 | 9.2.1 | | N/A | |
| `wasm32-unknown-emscripten` [6] | 3.1.14 | 15.0.0 | ✓ | N/A | ✓ |
| `x86_64-linux-android` [1] | 9.0.8 | 9.0.8 | ✓ | 6.1.0 | ✓ |
| `x86_64-pc-windows-gnu` | N/A | 9.3 | ✓ | N/A | ✓ |
| `x86_64-pc-solaris` | 1.22.7 | 8.4.0 | ✓ | N/A | |
| `x86_64-unknown-freebsd` | 1.6 | 13.3.0 | ✓ | N/A | |
| `x86_64-unknown-dragonfly` [2] [3] | 6.0.1 | 10.3.0 | ✓ | N/A | |
| `x86_64-unknown-illumos` | 1.20.4 | 8.4.0 | ✓ | N/A | |
| `x86_64-unknown-linux-gnu` | 2.31 | 9.4.0 | ✓ | 6.1.0 | ✓ |
| `x86_64-unknown-linux-gnu:centos` [5] | 2.17 | 4.8.5 | ✓ | 4.2.1 | ✓ |
| `x86_64-unknown-linux-musl` | 1.2.3 | 9.2.0 | ✓ | N/A | ✓ |
| `x86_64-unknown-netbsd` [3] | 9.2.0 | 9.4.0 | ✓ | N/A | |
<!--| `asmjs-unknown-emscripten` [7] | 3.1.14 | 15.0.0 | ✓ | N/A | ✓ |-->

[1] libc = bionic; Only works with native tests, that is, tests that do not
depends on the Android Runtime. For i686 some tests may fails with the
The versions below reflect the current Dockerfiles and toolchain configuration.
Package-based entries use the versions supplied by Ubuntu 24.04 (Noble); those
versions may change when the Ubuntu repositories are updated.

| Target | libc/API | GCC/Clang | GFortran | C++ | QEMU | `test` |
|--------------------------------------------------|-----------:|----------:|---------:|:---:|------:|:------:|
| `aarch64-linux-android` [1] | 9.0 / 28 | 14.0.7 | N/A | ✓ | 10.1.0 | ✓ |
| `aarch64-unknown-freebsd` | 1.6 | 13.3.0 | 13.3.0 | ✓ | N/A | |
| `aarch64-unknown-linux-gnu` | 2.39 | 13.3.0 | 13.3.0 | ✓ | 10.1.0 | ✓ |
| `aarch64-unknown-linux-gnu:centos` [7] | 2.17 | 4.8.5 | 4.8.5 | ✓ | 4.2.1 | ✓ |
| `aarch64-unknown-linux-musl` | 1.2.5 | 14.4.0 | 14.4.0 | ✓ | 10.1.0 | ✓ |
| `aarch64_be-unknown-linux-gnu` | 2.36 | 14.2.0 | 14.2.0 | ✓ | 10.1.0 | ✓ |
| `arm-linux-androideabi` [1] | 9.0 / 28 | 14.0.7 | N/A | ✓ | 10.1.0 | ✓ |
| `arm-unknown-linux-gnueabi` | 2.39 | 13.3.0 | 13.3.0 | ✓ | 10.1.0 | ✓ |
| `arm-unknown-linux-gnueabihf` | 2.17 | 8.3.0 | 8.3.0 | ✓ | 10.1.0 | ✓ |
| `arm-unknown-linux-musleabi` | 1.2.5 | 14.4.0 | 14.4.0 | ✓ | 10.1.0 | ✓ |
| `arm-unknown-linux-musleabihf` | 1.2.5 | 14.4.0 | 14.4.0 | ✓ | 10.1.0 | ✓ |
| `armv5te-unknown-linux-gnueabi` | 2.39 | 13.3.0 | 13.3.0 | ✓ | 10.1.0 | ✓ |
| `armv5te-unknown-linux-musleabi` | 1.2.5 | 14.4.0 | 14.4.0 | ✓ | 10.1.0 | ✓ |
| `armv7-linux-androideabi` [1] | 9.0 / 28 | 14.0.7 | N/A | ✓ | 10.1.0 | ✓ |
| `armv7-unknown-linux-gnueabi` | 2.39 | 13.3.0 | 13.3.0 | ✓ | 10.1.0 | ✓ |
| `armv7-unknown-linux-gnueabihf` | 2.39 | 13.3.0 | 13.3.0 | ✓ | 10.1.0 | ✓ |
| `armv7-unknown-linux-musleabi` | 1.2.5 | 14.4.0 | 14.4.0 | ✓ | 10.1.0 | ✓ |
| `armv7-unknown-linux-musleabihf` | 1.2.5 | 14.4.0 | 14.4.0 | ✓ | 10.1.0 | ✓ |
| `i586-unknown-linux-gnu` | 2.39 | 13.3.0 | 13.3.0 | ✓ | 10.1.0 | ✓ |
| `i586-unknown-linux-musl` | 1.2.5 | 14.4.0 | 14.4.0 | ✓ | 10.1.0 | ✓ |
| `i686-linux-android` [1] | 9.0 / 28 | 14.0.7 | N/A | ✓ | 10.1.0 | ✓ |
| `i686-pc-windows-gnu` | N/A | 13.2.0 | 13.2.0 | ✓ | N/A | ✓ |
| `i686-unknown-freebsd` | 1.6 | 13.3.0 | 13.3.0 | ✓ | N/A | |
| `i686-unknown-linux-gnu` | 2.39 | 13.3.0 | 13.3.0 | ✓ | 10.1.0 | ✓ |
| `i686-unknown-linux-musl` | 1.2.5 | 14.4.0 | 14.4.0 | ✓ | 10.1.0 | ✓ |
| `loongarch64-unknown-linux-gnu` | 2.36 | 14.2.0 | 14.2.0 | ✓ | 10.1.0 | ✓ |
| `loongarch64-unknown-linux-musl` | 1.2.5 | 14.2.0 | 14.2.0 | ✓ | 10.1.0 | ✓ |
| `mips-unknown-linux-gnu` | 2.39 | 13.3.0 | 13.3.0 | ✓ | 10.1.0 | ✓ |
| `mips-unknown-linux-musl` | 1.2.5 | 14.4.0 | 14.4.0 | ✓ | 10.1.0 | ✓ |
| `mips64-unknown-linux-gnuabi64` | 2.39 | 13.3.0 | 13.3.0 | ✓ | 10.1.0 | ✓ |
| `mips64-unknown-linux-muslabi64` | 1.2.5 | 14.4.0 | 14.4.0 | ✓ | 10.1.0 | ✓ |
| `mips64el-unknown-linux-gnuabi64` | 2.39 | 13.3.0 | 13.3.0 | ✓ | 10.1.0 | ✓ |
| `mips64el-unknown-linux-muslabi64` | 1.2.5 | 14.4.0 | 14.4.0 | ✓ | 10.1.0 | ✓ |
| `mipsel-unknown-linux-gnu` | 2.39 | 13.3.0 | 13.3.0 | ✓ | 10.1.0 | ✓ |
| `mipsel-unknown-linux-musl` | 1.2.5 | 14.4.0 | 14.4.0 | ✓ | 10.1.0 | ✓ |
| `powerpc-unknown-linux-gnu` | 2.39 | 13.3.0 | 13.3.0 | ✓ | 10.1.0 | ✓ |
| `powerpc64-unknown-linux-gnu` | 2.39 | 13.3.0 | 13.3.0 | ✓ | 10.1.0 | ✓ |
| `powerpc64le-unknown-linux-gnu` | 2.39 | 13.3.0 | 13.3.0 | ✓ | 10.1.0 | ✓ |
| `riscv64gc-unknown-linux-gnu` | 2.39 | 13.3.0 | 13.3.0 | ✓ | 10.1.0 | ✓ |
| `riscv64gc-unknown-linux-musl` | 1.2.5 | 14.2.0 | 14.2.0 | ✓ | 10.1.0 | ✓ |
| `s390x-unknown-linux-gnu` | 2.39 | 13.3.0 | 13.3.0 | ✓ | 10.1.0 | ✓ |
| `sparc64-unknown-linux-gnu` | 2.39 | 13.3.0 | 13.3.0 | ✓ | 10.1.0 | ✓ |
| `sparcv9-sun-solaris` | 1.22.7 | 8.4.0 | 8.4.0 | ✓ | N/A | |
| `thumbv6m-none-eabi` [4] | 4.4.0 | 13.2.1 | N/A | ✓ | 10.1.0 | |
| `thumbv7em-none-eabi` [4] | 4.4.0 | 13.2.1 | N/A | ✓ | 10.1.0 | |
| `thumbv7em-none-eabihf` [4] | 4.4.0 | 13.2.1 | N/A | ✓ | 10.1.0 | |
| `thumbv7m-none-eabi` [4] | 4.4.0 | 13.2.1 | N/A | ✓ | 10.1.0 | |
| `thumbv7neon-linux-androideabi` [1] | 9.0 / 28 | 14.0.7 | N/A | ✓ | 10.1.0 | ✓ |
| `thumbv7neon-unknown-linux-gnueabihf` | 2.39 | 13.3.0 | 13.3.0 | ✓ | 10.1.0 | ✓ |
| `thumbv8m.base-none-eabi` [4] | 4.4.0 | 13.2.1 | N/A | ✓ | 10.1.0 | |
| `thumbv8m.main-none-eabi` [4] | 4.4.0 | 13.2.1 | N/A | ✓ | 10.1.0 | |
| `thumbv8m.main-none-eabihf` [4] | 4.4.0 | 13.2.1 | N/A | ✓ | 10.1.0 | |
| `wasm32-unknown-emscripten` [6] | 3.1.74 | 20.0.0git | N/A | ✓ | N/A | ✓ |
| `x86_64-linux-android` [1] | 9.0 / 28 | 14.0.7 | N/A | ✓ | 10.1.0 | ✓ |
| `x86_64-pc-solaris` | 1.22.7 | 8.4.0 | 8.4.0 | ✓ | N/A | |
| `x86_64-pc-windows-gnu` | N/A | 13.2.0 | 13.2.0 | ✓ | N/A | ✓ |
| `x86_64-unknown-dragonfly` [2] [3] | 6.0.1 | 10.3.0 | 10.3.0 | ✓ | N/A | |
| `x86_64-unknown-freebsd` | 1.6 | 13.3.0 | 13.3.0 | ✓ | N/A | |
| `x86_64-unknown-illumos` | 1.20.4 | 8.4.0 | 8.4.0 | ✓ | N/A | |
| `x86_64-unknown-linux-gnu` | 2.39 | 13.3.0 | 13.3.0 | ✓ | 10.1.0 | ✓ |
| `x86_64-unknown-linux-gnu:centos` [5] | 2.17 | 4.8.5 | 4.8.5 | ✓ | 4.2.1 | ✓ |
| `x86_64-unknown-linux-musl` | 1.2.5 | 14.4.0 | 14.4.0 | ✓ | N/A | ✓ |
| `x86_64-unknown-netbsd` [3] | 9.3 | 9.4.0 | 9.4.0 | ✓ | N/A | |

[1] libc = bionic; the libc/API column shows the default Android system release
and API level, and the GCC/Clang column shows the NDK Clang version.
GFortran is not included in the Android NDK. Only works with native tests,
that is, tests that do not depend on the Android Runtime. For i686 some
tests may fail with the
error `assertion failed: signal(libc::SIGPIPE, libc::SIG_IGN) !=
libc::SIG_ERR`, see [issue
#140](https://github.com/cross-rs/cross/issues/140) for more information.
Expand All @@ -283,7 +291,8 @@ terminate.
`Cross.toml` for `[target.x86_64-unknown-linux-gnu]` to use the
CentOS7-compatible target.

[6] libc = emscripten and GCC = clang
[6] libc = emscripten and the GCC/Clang column shows the bundled Clang version.
GFortran is not included.

[7] Must change
`image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main-centos"` in
Expand Down
21 changes: 11 additions & 10 deletions docker/Dockerfile.aarch64-unknown-linux-musl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,31 @@ RUN /cmake.sh

FROM cross-base AS build

ARG VERBOSE
COPY crosstool-ng.sh /
COPY crosstool-config/aarch64-unknown-linux-musl.config /
RUN /crosstool-ng.sh aarch64-unknown-linux-musl.config 5

ENV PATH=/x-tools/aarch64-unknown-linux-musl/bin/:$PATH

COPY qemu.sh /
RUN /qemu.sh aarch64

COPY musl.sh /
RUN /musl.sh TARGET=aarch64-linux-musl

COPY tidyup.sh /
RUN /tidyup.sh

FROM scratch AS final
COPY --from=build / /
CMD ["/bin/bash"]
ENV PATH=/x-tools/aarch64-unknown-linux-musl/bin/:$PATH

ENV CROSS_TOOLCHAIN_PREFIX=aarch64-linux-musl-
ENV CROSS_SYSROOT=/usr/local/aarch64-linux-musl
COPY musl-symlink.sh /
RUN /musl-symlink.sh $CROSS_SYSROOT aarch64

COPY musl-gcc.sh /usr/bin/"$CROSS_TOOLCHAIN_PREFIX"gcc.sh
COPY qemu-runner base-runner.sh /
COPY toolchain.cmake /opt/toolchain.cmake

ENV CROSS_TOOLCHAIN_PREFIX=aarch64-unknown-linux-musl-
ENV CROSS_SYSROOT=/x-tools/aarch64-unknown-linux-musl/aarch64-unknown-linux-musl/sysroot/
ENV CROSS_TARGET_RUNNER="/qemu-runner aarch64"
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc.sh \
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUNNER="$CROSS_TARGET_RUNNER" \
AR_aarch64_unknown_linux_musl="$CROSS_TOOLCHAIN_PREFIX"ar \
CC_aarch64_unknown_linux_musl="$CROSS_TOOLCHAIN_PREFIX"gcc \
Expand Down
19 changes: 9 additions & 10 deletions docker/Dockerfile.arm-unknown-linux-musleabi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,23 @@ FROM cross-base AS build
COPY qemu.sh /
RUN /qemu.sh arm

COPY musl.sh /
RUN /musl.sh \
TARGET=arm-linux-musleabi \
"COMMON_CONFIG += --with-arch=armv6 \
--with-float=soft \
--with-mode=arm"
ARG VERBOSE
COPY crosstool-ng.sh /
COPY crosstool-config/arm-unknown-linux-musleabi.config /
RUN /crosstool-ng.sh arm-unknown-linux-musleabi.config 5

ENV PATH=/x-tools/arm-unknown-linux-musleabi/bin/:$PATH

COPY tidyup.sh /
RUN /tidyup.sh

FROM scratch AS final
COPY --from=build / /
CMD ["/bin/bash"]
ENV PATH=/x-tools/arm-unknown-linux-musleabi/bin/:$PATH

ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-musleabi-
ENV CROSS_SYSROOT=/usr/local/arm-linux-musleabi
COPY musl-symlink.sh /
RUN /musl-symlink.sh $CROSS_SYSROOT arm
ENV CROSS_TOOLCHAIN_PREFIX=arm-unknown-linux-musleabi-
ENV CROSS_SYSROOT=/x-tools/arm-unknown-linux-musleabi/arm-unknown-linux-musleabi/sysroot/

COPY qemu-runner base-runner.sh /
COPY toolchain.cmake /opt/toolchain.cmake
Expand Down
20 changes: 9 additions & 11 deletions docker/Dockerfile.arm-unknown-linux-musleabihf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,23 @@ FROM cross-base AS build
COPY qemu.sh /
RUN /qemu.sh arm

COPY musl.sh /
RUN /musl.sh \
TARGET=arm-linux-musleabihf \
"COMMON_CONFIG += --with-arch=armv6 \
--with-fpu=vfp \
--with-float=hard \
--with-mode=arm"
ARG VERBOSE
COPY crosstool-ng.sh /
COPY crosstool-config/arm-unknown-linux-musleabihf.config /
RUN /crosstool-ng.sh arm-unknown-linux-musleabihf.config 5

ENV PATH=/x-tools/arm-unknown-linux-musleabihf/bin/:$PATH

COPY tidyup.sh /
RUN /tidyup.sh

FROM scratch AS final
COPY --from=build / /
CMD ["/bin/bash"]
ENV PATH=/x-tools/arm-unknown-linux-musleabihf/bin/:$PATH

ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-musleabihf-
ENV CROSS_SYSROOT=/usr/local/arm-linux-musleabihf
COPY musl-symlink.sh /
RUN /musl-symlink.sh $CROSS_SYSROOT armhf
ENV CROSS_TOOLCHAIN_PREFIX=arm-unknown-linux-musleabihf-
ENV CROSS_SYSROOT=/x-tools/arm-unknown-linux-musleabihf/arm-unknown-linux-musleabihf/sysroot/

COPY qemu-runner base-runner.sh /
COPY toolchain.cmake /opt/toolchain.cmake
Expand Down
18 changes: 10 additions & 8 deletions docker/Dockerfile.armv5te-unknown-linux-musleabi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,29 @@ FROM cross-base AS build
COPY qemu.sh /
RUN /qemu.sh arm

COPY musl.sh /
RUN /musl.sh TARGET=arm-linux-musleabi "COMMON_CONFIG += --with-arch=armv5te --with-float=soft --with-mode=arm"
ARG VERBOSE
COPY crosstool-ng.sh /
COPY crosstool-config/armv5te-unknown-linux-musleabi.config /
RUN /crosstool-ng.sh armv5te-unknown-linux-musleabi.config 5

ENV PATH=/x-tools/arm-unknown-linux-musleabi/bin/:$PATH

COPY tidyup.sh /
RUN /tidyup.sh

FROM scratch AS final
COPY --from=build / /
CMD ["/bin/bash"]
ENV PATH=/x-tools/arm-unknown-linux-musleabi/bin/:$PATH

ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-musleabi-
ENV CROSS_SYSROOT=/usr/local/arm-linux-musleabi
COPY musl-symlink.sh /
RUN /musl-symlink.sh $CROSS_SYSROOT arm
ENV CROSS_TOOLCHAIN_PREFIX=arm-unknown-linux-musleabi-
ENV CROSS_SYSROOT=/x-tools/arm-unknown-linux-musleabi/arm-unknown-linux-musleabi/sysroot/

COPY musl-gcc.sh /usr/bin/"$CROSS_TOOLCHAIN_PREFIX"gcc.sh
COPY qemu-runner base-runner.sh /
COPY toolchain.cmake /opt/toolchain.cmake

ENV CROSS_TARGET_RUNNER="/qemu-runner arm"
ENV CARGO_TARGET_ARMV5TE_UNKNOWN_LINUX_MUSLEABI_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc.sh \
ENV CARGO_TARGET_ARMV5TE_UNKNOWN_LINUX_MUSLEABI_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
CARGO_TARGET_ARMV5TE_UNKNOWN_LINUX_MUSLEABI_RUNNER="$CROSS_TARGET_RUNNER" \
AR_armv5te_unknown_linux_musleabi="$CROSS_TOOLCHAIN_PREFIX"ar \
CC_armv5te_unknown_linux_musleabi="$CROSS_TOOLCHAIN_PREFIX"gcc \
Expand Down
Loading
Loading