diff options
| author | bors <bors@rust-lang.org> | 2017-12-27 22:39:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-12-27 22:39:00 +0000 |
| commit | e687205fd05a1390f45e21bbe21b5cdf0bab5af8 (patch) | |
| tree | e4a0a0a20d9a19b58927f26a60a7a76f501b7078 /src/ci | |
| parent | 1abeb436d5b9618d96fe5ac093146aa3d782ef26 (diff) | |
| parent | 606a0a5da0978de723a79dfbebd04280f31d1ab1 (diff) | |
| download | rust-e687205fd05a1390f45e21bbe21b5cdf0bab5af8.tar.gz rust-e687205fd05a1390f45e21bbe21b5cdf0bab5af8.zip | |
Auto merge of #47016 - malbarbo:dist-armv5te, r=alexcrichton
Add dist builder for armv5te-unknown-linux-gnueabi (again) The dist builder was first add in https://github.com/rust-lang/rust/pull/46498 and later remove in https://github.com/rust-lang/rust/pull/46498 because of https://github.com/rust-lang/rust/issues/46822. https://github.com/rust-lang/rust/issues/46822 seems to be fixed now (I and @green-s have [tested](https://github.com/rust-lang/rust/pull/46498#issuecomment-353901216) it).
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/dist-various-1/Dockerfile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile index a616693311a..b58ee7a719c 100644 --- a/src/ci/docker/dist-various-1/Dockerfile +++ b/src/ci/docker/dist-various-1/Dockerfile @@ -46,15 +46,20 @@ ENV TARGETS=$TARGETS,mips-unknown-linux-musl ENV TARGETS=$TARGETS,mipsel-unknown-linux-musl ENV TARGETS=$TARGETS,arm-unknown-linux-musleabi ENV TARGETS=$TARGETS,arm-unknown-linux-musleabihf +ENV TARGETS=$TARGETS,armv5te-unknown-linux-gnueabi ENV TARGETS=$TARGETS,armv7-unknown-linux-musleabihf ENV TARGETS=$TARGETS,aarch64-unknown-linux-musl ENV TARGETS=$TARGETS,sparc64-unknown-linux-gnu ENV TARGETS=$TARGETS,x86_64-unknown-redox +# FIXME: remove armv5te vars after https://github.com/alexcrichton/cc-rs/issues/271 +# get fixed and cc update 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_x86_64_unknown_redox=x86_64-unknown-redox-gcc \ + CC_armv5te_unknown_linux_gnueabi=arm-linux-gnueabi-gcc \ + CFLAGS_armv5te_unknown_linux_gnueabi="-march=armv5te -marm -mfloat-abi=soft" # Suppress some warnings in the openwrt toolchains we downloaded ENV STAGING_DIR=/tmp |