diff options
| author | bors <bors@rust-lang.org> | 2018-07-25 09:45:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-07-25 09:45:06 +0000 |
| commit | fefe81605d6111faa8dbb3635ab2c51d59de740a (patch) | |
| tree | 7caa89ae5f137ec6409383cbf14e71ff442a5593 /src/ci | |
| parent | 13985724033467ab86da9136c43fe242092b294e (diff) | |
| parent | 35a3d6f76b9867275ece435b1093f0523acc519e (diff) | |
| download | rust-fefe81605d6111faa8dbb3635ab2c51d59de740a.tar.gz rust-fefe81605d6111faa8dbb3635ab2c51d59de740a.zip | |
Auto merge of #52561 - ljedrz:fixme_cc_271, r=alexcrichton
Remove obsolete armv5te vars from the dist-various-1 Dockerfile The [related cc issue](https://github.com/alexcrichton/cc-rs/issues/271) is closed and its changes are in force.
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/dist-various-1/Dockerfile | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile index 702f9b2886e..6302f550091 100644 --- a/src/ci/docker/dist-various-1/Dockerfile +++ b/src/ci/docker/dist-various-1/Dockerfile @@ -103,16 +103,10 @@ ENV TARGETS=$TARGETS,thumbv7m-none-eabi ENV TARGETS=$TARGETS,thumbv7em-none-eabi ENV TARGETS=$TARGETS,thumbv7em-none-eabihf -# 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_armv5te_unknown_linux_gnueabi=arm-linux-gnueabi-gcc \ - CFLAGS_armv5te_unknown_linux_gnueabi="-march=armv5te -marm -mfloat-abi=soft" \ - CC_armv5te_unknown_linux_musleabi=arm-linux-gnueabi-gcc \ - CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft" + CC_x86_64_unknown_redox=x86_64-unknown-redox-gcc ENV RUST_CONFIGURE_ARGS \ --musl-root-armv5te=/musl-armv5te \ |