diff options
| author | bors <bors@rust-lang.org> | 2019-01-29 09:42:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-29 09:42:13 +0000 |
| commit | 106b3e9fa4d53efc4e8eab47d1043789c88f99a5 (patch) | |
| tree | eadf4b6d352f98e2f5407482b326297a50e0b86f /src/ci | |
| parent | 5f60208ba11171c249284f8fe0ea6b3e9b63383c (diff) | |
| parent | 7dbb70eea3aaef916ca3fd794e02f9f408bdf821 (diff) | |
| download | rust-106b3e9fa4d53efc4e8eab47d1043789c88f99a5.tar.gz rust-106b3e9fa4d53efc4e8eab47d1043789c88f99a5.zip | |
Auto merge of #57862 - hsivonen:buildneon, r=alexcrichton
Build the standard library for thumbv7neon-unknown-linux-gnueabihf in CI Using the `dist-armv7-linux` image instead of `dist-various-1` in order to use the ARMv7 toolchain available in `dist-armv7-linux`. Closes #57030.
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/dist-various-1/Dockerfile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile index 76cdd367987..ab2dd5a3992 100644 --- a/src/ci/docker/dist-various-1/Dockerfile +++ b/src/ci/docker/dist-various-1/Dockerfile @@ -116,13 +116,17 @@ ENV TARGETS=$TARGETS,armebv7r-none-eabi ENV TARGETS=$TARGETS,armebv7r-none-eabihf ENV TARGETS=$TARGETS,armv7r-none-eabi ENV TARGETS=$TARGETS,armv7r-none-eabihf +ENV TARGETS=$TARGETS,thumbv7neon-unknown-linux-gnueabihf ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \ CC_mips_unknown_linux_musl=mips-openwrt-linux-gcc \ CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc \ CC_x86_64_unknown_redox=x86_64-unknown-redox-gcc \ - CC_armebv7r_none_eabi=arm-none-eabi-gcc - + CC_armebv7r_none_eabi=arm-none-eabi-gcc \ + CC_thumbv7neon_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc \ + AR_thumbv7neon_unknown_linux_gnueabihf=arm-linux-gnueabihf-ar \ + CXX_thumbv7neon_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++ + ENV RUST_CONFIGURE_ARGS \ --musl-root-armv5te=/musl-armv5te \ --musl-root-arm=/musl-arm \ |