Skip to content

Commit 9d97606

Browse files
committed
Allow old toolchain on some images
LLVM 16 will require GCC >= 7.1. For now, set the flag that allows using an older toolchain.
1 parent 8c1f9d0 commit 9d97606

File tree

13 files changed

+25
-12
lines changed

13 files changed

+25
-12
lines changed

Diff for: src/ci/docker/host-x86_64/arm-android/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ ENV PATH=$PATH:/android/sdk/platform-tools
2929

3030
ENV TARGETS=arm-linux-androideabi
3131

32-
ENV RUST_CONFIGURE_ARGS --arm-linux-androideabi-ndk=/android/ndk/arm-14
32+
ENV RUST_CONFIGURE_ARGS --arm-linux-androideabi-ndk=/android/ndk/arm-14 \
33+
--set llvm.allow-old-toolchain
3334

3435
ENV SCRIPT python3 ../x.py --stage 2 test --host='' --target $TARGETS
3536

Diff for: src/ci/docker/host-x86_64/dist-android/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ ENV RUST_CONFIGURE_ARGS \
3232
--i686-linux-android-ndk=/android/ndk/x86-14 \
3333
--aarch64-linux-android-ndk=/android/ndk/arm64-21 \
3434
--x86_64-linux-android-ndk=/android/ndk/x86_64-21 \
35-
--disable-docs
35+
--disable-docs \
36+
--set llvm.allow-old-toolchain
3637

3738
ENV SCRIPT python3 ../x.py dist --host='' --target $TARGETS
3839

Diff for: src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ RUN /scripts/cmake.sh
3636
ENV RUST_CONFIGURE_ARGS \
3737
--musl-root-i586=/musl-i586 \
3838
--musl-root-i686=/musl-i686 \
39-
--disable-docs
39+
--disable-docs \
40+
--set llvm.allow-old-toolchain
4041

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

Diff for: src/ci/docker/host-x86_64/dist-mips-linux/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@ RUN /scripts/cmake.sh
2626

2727
ENV HOSTS=mips-unknown-linux-gnu
2828

29-
ENV RUST_CONFIGURE_ARGS --enable-extended --disable-docs
29+
ENV RUST_CONFIGURE_ARGS --enable-extended --disable-docs \
30+
--set llvm.allow-old-toolchain
3031
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS

Diff for: src/ci/docker/host-x86_64/dist-mips64-linux/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@ RUN /scripts/cmake.sh
2525

2626
ENV HOSTS=mips64-unknown-linux-gnuabi64
2727

28-
ENV RUST_CONFIGURE_ARGS --enable-extended --disable-docs
28+
ENV RUST_CONFIGURE_ARGS --enable-extended --disable-docs \
29+
--set llvm.allow-old-toolchain
2930
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS

Diff for: src/ci/docker/host-x86_64/dist-mips64el-linux/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@ RUN /scripts/cmake.sh
2626

2727
ENV HOSTS=mips64el-unknown-linux-gnuabi64
2828

29-
ENV RUST_CONFIGURE_ARGS --enable-extended --disable-docs
29+
ENV RUST_CONFIGURE_ARGS --enable-extended --disable-docs \
30+
--set llvm.allow-old-toolchain
3031
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS

Diff for: src/ci/docker/host-x86_64/dist-mipsel-linux/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@ RUN /scripts/cmake.sh
2525

2626
ENV HOSTS=mipsel-unknown-linux-gnu
2727

28-
ENV RUST_CONFIGURE_ARGS --enable-extended --disable-docs
28+
ENV RUST_CONFIGURE_ARGS --enable-extended --disable-docs \
29+
--set llvm.allow-old-toolchain
2930
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS

Diff for: src/ci/docker/host-x86_64/dist-x86_64-netbsd/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@ ENV \
2121

2222
ENV HOSTS=x86_64-unknown-netbsd
2323

24-
ENV RUST_CONFIGURE_ARGS --enable-extended --disable-docs
24+
ENV RUST_CONFIGURE_ARGS --enable-extended --disable-docs \
25+
--set llvm.allow-old-toolchain
2526
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS

Diff for: src/ci/docker/host-x86_64/i686-gnu-nopt/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ RUN mkdir -p /config
2727
RUN echo "[rust]" > /config/nopt-std-config.toml
2828
RUN echo "optimize = false" >> /config/nopt-std-config.toml
2929

30-
ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu --disable-optimize-tests
30+
ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu --disable-optimize-tests \
31+
--set llvm.allow-old-toolchain
3132
ENV SCRIPT python3 ../x.py test --stage 0 --config /config/nopt-std-config.toml library/std \
3233
&& python3 ../x.py --stage 2 test

Diff for: src/ci/docker/host-x86_64/i686-gnu/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ RUN sh /scripts/sccache.sh
2323
COPY scripts/cmake.sh /scripts/
2424
RUN /scripts/cmake.sh
2525

26-
ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu
26+
ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu \
27+
--set llvm.allow-old-toolchain
2728
# Exclude some tests that are unlikely to be platform specific, to speed up
2829
# this slow job.
2930
ENV SCRIPT python3 ../x.py --stage 2 test \

Diff for: src/ci/docker/host-x86_64/x86_64-gnu-aux/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@ RUN sh /scripts/sccache.sh
2626
COPY scripts/cmake.sh /scripts/
2727
RUN /scripts/cmake.sh
2828

29-
ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu
29+
ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu \
30+
--set llvm.allow-old-toolchain
3031
ENV RUST_CHECK_TARGET check-aux

Diff for: src/ci/docker/host-x86_64/x86_64-gnu-distcheck/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ RUN sh /scripts/sccache.sh
2222
COPY scripts/cmake.sh /scripts/
2323
RUN /scripts/cmake.sh
2424

25-
ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu --set rust.ignore-git=false
25+
ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu --set rust.ignore-git=false \
26+
--set llvm.allow-old-toolchain
2627
ENV SCRIPT python3 ../x.py --stage 2 test distcheck
2728
ENV DIST_SRC 1

Diff for: src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ COPY host-x86_64/x86_64-gnu-tools/browser-ui-test.version /tmp/
8181
RUN npm install -g browser-ui-test@$(head -n 1 /tmp/browser-ui-test.version) --unsafe-perm=true
8282

8383
ENV RUST_CONFIGURE_ARGS \
84+
--set llvm.allow-old-toolchain \
8485
--build=x86_64-unknown-linux-gnu \
8586
--save-toolstates=/tmp/toolstate/toolstates.json
8687

0 commit comments

Comments
 (0)