Skip to content

Commit 1f59c7e

Browse files
committed
Auto merge of #41267 - alexcrichton:fix-analysis-dist, r=alexcrichton
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.
2 parents 6c03efd + cdedecb commit 1f59c7e

File tree

6 files changed

+8
-3
lines changed

6 files changed

+8
-3
lines changed

src/bootstrap/step.rs

+1
Original file line numberDiff line numberDiff line change
@@ -700,6 +700,7 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
700700
.dep(|s| s.name("default:doc"))
701701
.run(move |s| dist::docs(build, s.stage, s.target));
702702
rules.dist("dist-analysis", "analysis")
703+
.default(build.config.extended)
703704
.dep(|s| s.name("dist-std"))
704705
.only_host_build(true)
705706
.run(move |s| dist::analysis(build, &s.compiler(), s.target));

src/ci/docker/cross/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \
7474
ENV STAGING_DIR=/tmp
7575

7676
ENV RUST_CONFIGURE_ARGS \
77+
--enable-extended \
7778
--target=$TARGETS \
7879
--musl-root-arm=/usr/local/arm-linux-musleabi \
7980
--musl-root-armhf=/usr/local/arm-linux-musleabihf \

src/ci/docker/dist-android/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ ENV TARGETS=$TARGETS,armv7-linux-androideabi
4242

4343
ENV RUST_CONFIGURE_ARGS \
4444
--target=$TARGETS \
45+
--enable-extended \
4546
--arm-linux-androideabi-ndk=/android/ndk-arm-9 \
4647
--armv7-linux-androideabi-ndk=/android/ndk-arm-9 \
4748
--i686-linux-android-ndk=/android/ndk-x86-9 \

src/ci/docker/dist-fuchsia/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ ENV \
4444
ENV TARGETS=x86_64-unknown-fuchsia
4545
ENV TARGETS=$TARGETS,aarch64-unknown-fuchsia
4646

47-
ENV RUST_CONFIGURE_ARGS --target=$TARGETS
47+
ENV RUST_CONFIGURE_ARGS --target=$TARGETS --enable-extended
4848
ENV SCRIPT python2.7 ../x.py dist --target $TARGETS

src/ci/docker/dist-i586-gnu-i686-musl/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ RUN curl -o /usr/local/bin/sccache \
3131

3232
ENV RUST_CONFIGURE_ARGS \
3333
--target=i686-unknown-linux-musl,i586-unknown-linux-gnu \
34-
--musl-root-i686=/musl-i686
34+
--musl-root-i686=/musl-i686 \
35+
--enable-extended
3536

3637
# Newer binutils broke things on some vms/distros (i.e., linking against
3738
# unknown relocs disabled by the following flag), so we need to go out of our

src/ci/docker/dist-x86_64-musl/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ RUN curl -o /usr/local/bin/sccache \
3131

3232
ENV RUST_CONFIGURE_ARGS \
3333
--target=x86_64-unknown-linux-musl \
34-
--musl-root-x86_64=/musl-x86_64
34+
--musl-root-x86_64=/musl-x86_64 \
35+
--enable-extended
3536

3637
# Newer binutils broke things on some vms/distros (i.e., linking against
3738
# unknown relocs disabled by the following flag), so we need to go out of our

0 commit comments

Comments
 (0)