diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-04-12 20:48:18 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-04-12 20:48:18 -0700 |
| commit | cdedecb7baa55a7e9c1aa78d5d7313b94e3e84b1 (patch) | |
| tree | 6f1d4aaf853edefe56b62679dc38fc05f699f44e /src/ci/docker | |
| parent | 14481f72102ba2abb5f314d5537fee90352981c5 (diff) | |
| download | rust-cdedecb7baa55a7e9c1aa78d5d7313b94e3e84b1.tar.gz rust-cdedecb7baa55a7e9c1aa78d5d7313b94e3e84b1.zip | |
travis: Enable rust-analysis package for more targets
This commit enables the `rust-analysis` package to be produced for all targets that are part of the `dist-*` suite of docker images on Travis. Currently these packages are showing up with `available = false` in the `channel-rust-nightly.toml` manifest where we'd prefer to have them show up for all targets. Unfortunately rustup isn't handling the `available = false` section well right now, so this should also inadvertently fix the nightly regression.
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/cross/Dockerfile | 1 | ||||
| -rw-r--r-- | src/ci/docker/dist-android/Dockerfile | 1 | ||||
| -rw-r--r-- | src/ci/docker/dist-fuchsia/Dockerfile | 2 | ||||
| -rw-r--r-- | src/ci/docker/dist-i586-gnu-i686-musl/Dockerfile | 3 | ||||
| -rw-r--r-- | src/ci/docker/dist-x86_64-musl/Dockerfile | 3 |
5 files changed, 7 insertions, 3 deletions
diff --git a/src/ci/docker/cross/Dockerfile b/src/ci/docker/cross/Dockerfile index 7c198441007..02d4eaf534a 100644 --- a/src/ci/docker/cross/Dockerfile +++ b/src/ci/docker/cross/Dockerfile @@ -74,6 +74,7 @@ ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \ ENV STAGING_DIR=/tmp ENV RUST_CONFIGURE_ARGS \ + --enable-extended \ --target=$TARGETS \ --musl-root-arm=/usr/local/arm-linux-musleabi \ --musl-root-armhf=/usr/local/arm-linux-musleabihf \ diff --git a/src/ci/docker/dist-android/Dockerfile b/src/ci/docker/dist-android/Dockerfile index 31f4b8b777b..99c176aa820 100644 --- a/src/ci/docker/dist-android/Dockerfile +++ b/src/ci/docker/dist-android/Dockerfile @@ -42,6 +42,7 @@ ENV TARGETS=$TARGETS,armv7-linux-androideabi ENV RUST_CONFIGURE_ARGS \ --target=$TARGETS \ + --enable-extended \ --arm-linux-androideabi-ndk=/android/ndk-arm-9 \ --armv7-linux-androideabi-ndk=/android/ndk-arm-9 \ --i686-linux-android-ndk=/android/ndk-x86-9 \ diff --git a/src/ci/docker/dist-fuchsia/Dockerfile b/src/ci/docker/dist-fuchsia/Dockerfile index 4a401bbb303..294460ed760 100644 --- a/src/ci/docker/dist-fuchsia/Dockerfile +++ b/src/ci/docker/dist-fuchsia/Dockerfile @@ -44,5 +44,5 @@ ENV \ ENV TARGETS=x86_64-unknown-fuchsia ENV TARGETS=$TARGETS,aarch64-unknown-fuchsia -ENV RUST_CONFIGURE_ARGS --target=$TARGETS +ENV RUST_CONFIGURE_ARGS --target=$TARGETS --enable-extended ENV SCRIPT python2.7 ../x.py dist --target $TARGETS diff --git a/src/ci/docker/dist-i586-gnu-i686-musl/Dockerfile b/src/ci/docker/dist-i586-gnu-i686-musl/Dockerfile index d2727cbdb35..1ef3e569cb4 100644 --- a/src/ci/docker/dist-i586-gnu-i686-musl/Dockerfile +++ b/src/ci/docker/dist-i586-gnu-i686-musl/Dockerfile @@ -31,7 +31,8 @@ RUN curl -o /usr/local/bin/sccache \ ENV RUST_CONFIGURE_ARGS \ --target=i686-unknown-linux-musl,i586-unknown-linux-gnu \ - --musl-root-i686=/musl-i686 + --musl-root-i686=/musl-i686 \ + --enable-extended # Newer binutils broke things on some vms/distros (i.e., linking against # unknown relocs disabled by the following flag), so we need to go out of our diff --git a/src/ci/docker/dist-x86_64-musl/Dockerfile b/src/ci/docker/dist-x86_64-musl/Dockerfile index a41c0cca3b5..f462ccbb911 100644 --- a/src/ci/docker/dist-x86_64-musl/Dockerfile +++ b/src/ci/docker/dist-x86_64-musl/Dockerfile @@ -31,7 +31,8 @@ RUN curl -o /usr/local/bin/sccache \ ENV RUST_CONFIGURE_ARGS \ --target=x86_64-unknown-linux-musl \ - --musl-root-x86_64=/musl-x86_64 + --musl-root-x86_64=/musl-x86_64 \ + --enable-extended # Newer binutils broke things on some vms/distros (i.e., linking against # unknown relocs disabled by the following flag), so we need to go out of our |