diff options
| author | bors <bors@rust-lang.org> | 2017-12-05 17:28:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-12-05 17:28:31 +0000 |
| commit | abe85ab0b232e744b602d20a65fbe92aa71c6045 (patch) | |
| tree | af2c02e3bc0a6f2381b532fad27769183eae3897 | |
| parent | bf2be6175e9f6414dd5ce19d120dcd444d79edea (diff) | |
| parent | bea65d4041beda401e39a460d05442572f5a5fd0 (diff) | |
| download | rust-abe85ab0b232e744b602d20a65fbe92aa71c6045.tar.gz rust-abe85ab0b232e744b602d20a65fbe92aa71c6045.zip | |
Auto merge of #46498 - malbarbo:dist-armv5te, r=alexcrichton
Add armv5te-unknown-linux-gnueabi to cross builder This is the only linux target missing in the dist builders.
| -rw-r--r-- | src/ci/docker/dist-various-1/Dockerfile | 7 | ||||
| -rw-r--r-- | src/tools/build-manifest/src/main.rs | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile index a616693311a..c6cb86ebd61 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 -mfloat-abi=soft" # Suppress some warnings in the openwrt toolchains we downloaded ENV STAGING_DIR=/tmp diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index c4e696e1760..371bbd16a5e 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -55,6 +55,7 @@ static TARGETS: &'static [&'static str] = &[ "arm-unknown-linux-gnueabihf", "arm-unknown-linux-musleabi", "arm-unknown-linux-musleabihf", + "armv5te-unknown-linux-gnueabi", "armv7-apple-ios", "armv7-linux-androideabi", "armv7-unknown-linux-gnueabihf", |