Skip to content

🚨 Fix LegacyKeyValueFormat report from docker build #152305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
homersimpsons wants to merge 1 commit into
base: main
Choose a base branch
from
Open

🚨 Fix LegacyKeyValueFormat report from docker build #152305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/ci/docker/host-aarch64/aarch64-gnu-debug/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,19 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

ENV RUSTBUILD_FORCE_CLANG_BASED_TESTS 1
ENV RUSTBUILD_FORCE_CLANG_BASED_TESTS="1"

# llvm.use-linker conflicts with downloading CI LLVM
ENV NO_DOWNLOAD_CI_LLVM 1
ENV NO_DOWNLOAD_CI_LLVM="1"

ENV RUST_CONFIGURE_ARGS \
ENV RUST_CONFIGURE_ARGS=" \
--build=aarch64-unknown-linux-gnu \
--enable-debug \
--enable-lld \
--set llvm.use-linker=lld \
--set target.aarch64-unknown-linux-gnu.linker=clang \
--set target.aarch64-unknown-linux-gnu.cc=clang \
--set target.aarch64-unknown-linux-gnu.cxx=clang++
--set target.aarch64-unknown-linux-gnu.cxx=clang++"

# This job appears to be checking two separate things:
# - That we can build the compiler with `--enable-debug`
Expand All @@ -52,6 +52,6 @@ ENV RUST_CONFIGURE_ARGS \
# Currently we only run the subset of tests with "clang" in their name.
# - See also FIXME(#132034)

ENV SCRIPT \
ENV SCRIPT=" \
python3 ../x.py --stage 2 build && \
python3 ../x.py --stage 2 test tests/run-make tests/run-make-cargo
python3 ../x.py --stage 2 test tests/run-make tests/run-make-cargo"
10 changes: 5 additions & 5 deletions src/ci/docker/host-aarch64/aarch64-gnu-llvm-20/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,20 @@ RUN sh /scripts/sccache.sh

# We are disabling CI LLVM since this builder is intentionally using a host
# LLVM, rather than the typical src/llvm-project LLVM.
ENV NO_DOWNLOAD_CI_LLVM 1
ENV EXTERNAL_LLVM 1
ENV NO_DOWNLOAD_CI_LLVM="1"
ENV EXTERNAL_LLVM="1"

# Using llvm-link-shared due to libffi issues -- see #34486
ENV RUST_CONFIGURE_ARGS \
ENV RUST_CONFIGURE_ARGS=" \
--build=aarch64-unknown-linux-gnu \
--llvm-root=/usr/lib/llvm-20 \
--enable-llvm-link-shared \
--set rust.randomize-layout=true \
--set rust.thin-lto-import-instr-limit=10
--set rust.thin-lto-import-instr-limit=10"

COPY scripts/shared.sh /scripts/

COPY scripts/stage_2_test_set1.sh /scripts/
COPY scripts/stage_2_test_set2.sh /scripts/

ENV SCRIPT "Must specify DOCKER_SCRIPT for this image"
ENV SCRIPT="Must specify DOCKER_SCRIPT for this image"
8 changes: 4 additions & 4 deletions src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

ENV RUST_CONFIGURE_ARGS \
ENV RUST_CONFIGURE_ARGS=" \
--build=aarch64-unknown-linux-gnu \
--enable-sanitizers \
--enable-profiler \
--enable-compiler-docs
ENV SCRIPT python3 ../x.py --stage 2 test && \
python3 ../x.py --stage 2 test src/tools/cargo
--enable-compiler-docs"
ENV SCRIP="python3 ../x.py --stage 2 test && \
python3 ../x.py --stage 2 test src/tools/cargo"
12 changes: 6 additions & 6 deletions src/ci/docker/host-aarch64/dist-aarch64-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ ENV HOSTS=aarch64-unknown-linux-gnu

ENV CPATH=/usr/include/aarch64-linux-gnu/:$CPATH
Copy link
Contributor Author

@homersimpsons homersimpsons Feb 7, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that here docker reports:

WARNING: UndefinedVar - https://docs.docker.com/go/dockerfile/rule/undefined-var/
Usage of undefined variable '$CPATH' (did you mean $PATH?)
src/ci/docker/host-aarch64/dist-aarch64-linux/Dockerfile:77
--------------------
  75 |     ENV HOSTS=aarch64-unknown-linux-gnu
  76 |
  77 | >>> ENV CPATH=/usr/include/aarch64-linux-gnu/:$CPATH
  78 |
  79 |     ENV RUST_CONFIGURE_ARGS=" \

I'm not sure if this warning should be fixed or if there is an error regarding this.

(That is the sole remaining warning after this commit)


ENV RUST_CONFIGURE_ARGS \
ENV RUST_CONFIGURE_ARGS=" \
--build=aarch64-unknown-linux-gnu \
--enable-full-tools \
--enable-profiler \
Expand All @@ -93,12 +93,12 @@ ENV RUST_CONFIGURE_ARGS \
--set rust.jemalloc \
--set rust.bootstrap-override-lld=true \
--set rust.lto=thin \
--set rust.codegen-units=1
--set rust.codegen-units=1"

ENV SCRIPT python3 ../x.py build --set rust.debug=true opt-dist && \
ENV SCRIPT="python3 ../x.py build --set rust.debug=true opt-dist && \
./build/$HOSTS/stage1-tools-bin/opt-dist linux-ci -- python3 ../x.py dist \
--host $HOSTS --target $HOSTS --include-default-paths build-manifest bootstrap
--host $HOSTS --target $HOSTS --include-default-paths build-manifest bootstrap"

ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=clang
ENV LIBCURL_NO_PKG_CONFIG 1
ENV DIST_REQUIRE_ALL_TOOLS 1
ENV LIBCURL_NO_PKG_CONFIG="1"
ENV DIST_REQUIRE_ALL_TOOLS="1"
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/arm-android/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ ENV PATH=$PATH:/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin

ENV TARGETS=arm-linux-androideabi

ENV RUST_CONFIGURE_ARGS --android-ndk=/android/ndk/
ENV RUST_CONFIGURE_ARGS="--android-ndk=/android/ndk/"

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

COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh
Expand Down
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/armhf-gnu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ RUN sh /scripts/sccache.sh

COPY static/gitconfig /etc/gitconfig

ENV RUST_CONFIGURE_ARGS --qemu-armhf-rootfs=/tmp/rootfs
ENV SCRIPT python3 ../x.py --stage 2 test --host='' --target arm-unknown-linux-gnueabihf
ENV RUST_CONFIGURE_ARGS="--qemu-armhf-rootfs=/tmp/rootfs"
ENV SCRIPT="python3 ../x.py --stage 2 test --host= --target arm-unknown-linux-gnueabihf"

ENV NO_CHANGE_USER=1
6 changes: 3 additions & 3 deletions src/ci/docker/host-x86_64/disabled/dist-aarch64-android/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ ENV DEP_Z_ROOT=/android/ndk/arm64-21/sysroot/usr/

ENV HOSTS=aarch64-linux-android

ENV RUST_CONFIGURE_ARGS \
ENV RUST_CONFIGURE_ARGS=" \
--aarch64-linux-android-ndk=/android/ndk/arm64-21 \
--disable-rpath \
--enable-extended \
--enable-cargo-openssl-static
--enable-cargo-openssl-static"

ENV SCRIPT python3 ../x.py dist --target $HOSTS --host $HOSTS
ENV SCRIPT="python3 ../x.py dist --target $HOSTS --host $HOSTS"

COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh
10 changes: 5 additions & 5 deletions src/ci/docker/host-x86_64/disabled/dist-armv7-android/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ ENV DEP_Z_ROOT=/android/ndk/arm-14/sysroot/usr/

ENV HOSTS=armv7-linux-androideabi

ENV RUST_CONFIGURE_ARGS \
ENV RUST_CONFIGURE_ARGS=" \
--armv7-linux-androideabi-ndk=/android/ndk/arm \
--disable-rpath \
--enable-extended \
--enable-cargo-openssl-static
--enable-cargo-openssl-static"

# We support api level 14, but api level 21 is required to build llvm. To
# overcome this problem we use a ndk with api level 21 to build llvm and then
Expand All @@ -32,12 +32,12 @@ ENV RUST_CONFIGURE_ARGS \
# level 14), the default linker behavior is to generate an error, to allow the
# build to finish we use --warn-unresolved-symbols. Note that the missing
# symbols does not affect std, only the compiler (llvm) and cargo (openssl).
ENV SCRIPT \
ENV SCRIPT=" \
python3 ../x.py --stage 2 build src/llvm --host $HOSTS --target $HOSTS && \
(export RUSTFLAGS="\"-C link-arg=-Wl,--warn-unresolved-symbols\""; \
(export RUSTFLAGS=\"-C link-arg=-Wl,--warn-unresolved-symbols\"; \
rm /android/ndk/arm && \
ln -s /android/ndk/arm-14 /android/ndk/arm && \
python3 ../x.py dist --host $HOSTS --target $HOSTS)
python3 ../x.py dist --host $HOSTS --target $HOSTS)"

COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh
10 changes: 5 additions & 5 deletions src/ci/docker/host-x86_64/disabled/dist-i686-android/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ ENV DEP_Z_ROOT=/android/ndk/x86-14/sysroot/usr/

ENV HOSTS=i686-linux-android

ENV RUST_CONFIGURE_ARGS \
ENV RUST_CONFIGURE_ARGS=" \
--i686-linux-android-ndk=/android/ndk/x86 \
--disable-rpath \
--enable-extended \
--enable-cargo-openssl-static
--enable-cargo-openssl-static"

# We support api level 14, but api level 21 is required to build llvm. To
# overcome this problem we use a ndk with api level 21 to build llvm and then
Expand All @@ -32,12 +32,12 @@ ENV RUST_CONFIGURE_ARGS \
# level 14), the default linker behavior is to generate an error, to allow the
# build to finish we use --warn-unresolved-symbols. Note that the missing
# symbols does not affect std, only the compiler (llvm) and cargo (openssl).
ENV SCRIPT \
ENV SCRIPT=" \
python3 ../x.py --stage 2 build src/llvm --host $HOSTS --target $HOSTS && \
(export RUSTFLAGS="\"-C link-arg=-Wl,--warn-unresolved-symbols\""; \
(export RUSTFLAGS=\"-C link-arg=-Wl,--warn-unresolved-symbols\"; \
rm /android/ndk/x86 && \
ln -s /android/ndk/x86-14 /android/ndk/x86 && \
python3 ../x.py dist --host $HOSTS --target $HOSTS)
python3 ../x.py dist --host $HOSTS --target $HOSTS)"

COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/disabled/dist-m68k-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ RUN sh /scripts/sccache.sh

ENV HOSTS=m68k-unknown-linux-gnu

ENV RUST_CONFIGURE_ARGS --host=$HOSTS --enable-extended
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS
ENV RUST_CONFIGURE_ARGS="--host=$HOSTS --enable-extended"
ENV SCRIPT="python3 ../x.py dist --host $HOSTS --target $HOSTS"
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/disabled/dist-powerpcspe-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ RUN sh /scripts/sccache.sh

ENV HOSTS=powerpc-unknown-linux-gnuspe

ENV RUST_CONFIGURE_ARGS --enable-extended --disable-docs
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS
ENV RUST_CONFIGURE_ARGS="--enable-extended --disable-docs"
ENV SCRIPT="python3 ../x.py dist --host $HOSTS --target $HOSTS"
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/disabled/dist-sparc64-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ RUN sh /scripts/sccache.sh

ENV HOSTS=sparc64-unknown-linux-gnu

ENV RUST_CONFIGURE_ARGS --enable-extended --disable-docs
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS
ENV RUST_CONFIGURE_ARGS="--enable-extended --disable-docs"
ENV SCRIPT="python3 ../x.py dist --host $HOSTS --target $HOSTS"
6 changes: 3 additions & 3 deletions src/ci/docker/host-x86_64/disabled/dist-x86_64-android/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ ENV DEP_Z_ROOT=/android/ndk/x86_64-21/sysroot/usr/

ENV HOSTS=x86_64-linux-android

ENV RUST_CONFIGURE_ARGS \
ENV RUST_CONFIGURE_ARGS=" \
--x86_64-linux-android-ndk=/android/ndk/x86_64-21 \
--disable-rpath \
--enable-extended \
--enable-cargo-openssl-static
--enable-cargo-openssl-static"

ENV SCRIPT python3 ../x.py dist --target $HOSTS --host $HOSTS
ENV SCRIPT="python3 ../x.py dist --target $HOSTS --host $HOSTS"

COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/disabled/dist-x86_64-dragonfly/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ ENV \

ENV HOSTS=x86_64-unknown-dragonfly

ENV RUST_CONFIGURE_ARGS --enable-extended
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS
ENV RUST_CONFIGURE_ARGS="--enable-extended"
ENV SCRIPT="python3 ../x.py dist --host $HOSTS --target $HOSTS"
8 changes: 4 additions & 4 deletions src/ci/docker/host-x86_64/disabled/dist-x86_64-haiku/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ RUN sh /scripts/sccache.sh
ENV HOST=x86_64-unknown-haiku
ENV TARGET=target.$HOST

ENV RUST_CONFIGURE_ARGS --disable-jemalloc \
ENV RUST_CONFIGURE_ARGS="--disable-jemalloc \
--set=$TARGET.cc=x86_64-unknown-haiku-gcc \
--set=$TARGET.cxx=x86_64-unknown-haiku-g++ \
--set=$TARGET.llvm-config=/bin/llvm-config-haiku
ENV EXTERNAL_LLVM 1
--set=$TARGET.llvm-config=/bin/llvm-config-haiku"
ENV EXTERNAL_LLVM="1"

ENV SCRIPT python3 ../x.py dist --host=$HOST --target=$HOST
ENV SCRIPT="python3 ../x.py dist --host=$HOST --target=$HOST"
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/disabled/dist-x86_64-redox/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ ENV \
CC_x86_64_unknown_redox=x86_64-unknown-redox-gcc \
CXX_x86_64_unknown_redox=x86_64-unknown-redox-g++

ENV RUST_CONFIGURE_ARGS --enable-extended
ENV SCRIPT python3 ../x.py dist --host='' --target x86_64-unknown-redox
ENV RUST_CONFIGURE_ARGS="--enable-extended"
ENV SCRIPT="python3 ../x.py dist --host= --target x86_64-unknown-redox"
6 changes: 3 additions & 3 deletions src/ci/docker/host-x86_64/disabled/riscv64gc-gnu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ RUN sh /scripts/sccache.sh
# Avoid "fatal: detected dubious ownership in repository at '/checkout'" error
RUN git config --global --add safe.directory /checkout

ENV RUST_CONFIGURE_ARGS \
ENV RUST_CONFIGURE_ARGS=" \
--qemu-riscv64-rootfs=/tmp/rootfs \
--set target.riscv64gc-unknown-linux-gnu.linker=riscv64-linux-gnu-gcc
ENV SCRIPT python3 ../x.py --stage 2 test --host='' --target riscv64gc-unknown-linux-gnu
--set target.riscv64gc-unknown-linux-gnu.linker=riscv64-linux-gnu-gcc"
ENV SCRIPT="python3 ../x.py --stage 2 test --host= --target riscv64gc-unknown-linux-gnu"

ENV NO_CHANGE_USER=1
6 changes: 3 additions & 3 deletions src/ci/docker/host-x86_64/dist-android/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ ENV TARGETS=$TARGETS,i686-linux-android
ENV TARGETS=$TARGETS,aarch64-linux-android
ENV TARGETS=$TARGETS,x86_64-linux-android

ENV RUST_CONFIGURE_ARGS \
ENV RUST_CONFIGURE_ARGS=" \
--enable-extended \
--enable-profiler \
--android-ndk=/android/ndk/ \
--disable-docs
--disable-docs"

ENV PATH=$PATH:/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin

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

COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh
6 changes: 3 additions & 3 deletions src/ci/docker/host-x86_64/dist-arm-linux-gnueabi/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ ENV CC_arm_unknown_linux_gnueabi=arm-unknown-linux-gnueabi-gcc \

ENV HOSTS=arm-unknown-linux-gnueabi

ENV RUST_CONFIGURE_ARGS \
ENV RUST_CONFIGURE_ARGS=" \
--enable-full-tools \
--disable-docs \
--enable-sanitizers \
--enable-profiler
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS
--enable-profiler"
ENV SCRIPT="python3 ../x.py dist --host $HOSTS --target $HOSTS"
6 changes: 3 additions & 3 deletions src/ci/docker/host-x86_64/dist-arm-linux-musl/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ RUN sh /scripts/sccache.sh

ENV HOSTS=aarch64-unknown-linux-musl

ENV RUST_CONFIGURE_ARGS \
ENV RUST_CONFIGURE_ARGS=" \
--enable-full-tools \
--disable-docs \
--musl-root-aarch64=/usr/local/aarch64-linux-musl \
--enable-sanitizers \
--enable-profiler \
--set target.aarch64-unknown-linux-musl.crt-static=false
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS
--set target.aarch64-unknown-linux-musl.crt-static=false"
ENV SCRIPT="python3 ../x.py dist --host $HOSTS --target $HOSTS"
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/dist-armhf-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ ENV CC_arm_unknown_linux_gnueabihf=arm-unknown-linux-gnueabihf-gcc \

ENV HOSTS=arm-unknown-linux-gnueabihf

ENV RUST_CONFIGURE_ARGS --enable-full-tools --enable-profiler --disable-docs
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS
ENV RUST_CONFIGURE_ARGS="--enable-full-tools --enable-profiler --disable-docs"
ENV SCRIPT="python3 ../x.py dist --host $HOSTS --target $HOSTS"
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/dist-armv7-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ ENV CC_armv7_unknown_linux_gnueabihf=armv7-unknown-linux-gnueabihf-gcc \

ENV HOSTS=armv7-unknown-linux-gnueabihf

ENV RUST_CONFIGURE_ARGS --enable-full-tools --enable-profiler --disable-docs
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS
ENV RUST_CONFIGURE_ARGS="--enable-full-tools --enable-profiler --disable-docs"
ENV SCRIPT="python3 ../x.py dist --host $HOSTS --target $HOSTS"
10 changes: 5 additions & 5 deletions src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ RUN ln -s /usr/lib32/libgcc_s.so.1 /musl-i686/lib/
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

ENV RUST_CONFIGURE_ARGS \
ENV RUST_CONFIGURE_ARGS=" \
--musl-root-i586=/musl-i586 \
--musl-root-i686=/musl-i686 \
--disable-docs
--disable-docs"

# 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
Expand All @@ -73,6 +73,6 @@ ENV CFLAGS_i586_unknown_linux_musl=-Wa,-mrelax-relocations=no

ENV TARGETS=i586-unknown-linux-gnu,i686-unknown-linux-musl

ENV SCRIPT \
python3 ../x.py --stage 2 test --host='' --target $TARGETS && \
python3 ../x.py dist --host='' --target $TARGETS,i586-unknown-linux-musl
ENV SCRIPT=" \
python3 ../x.py --stage 2 test --host= --target $TARGETS && \
python3 ../x.py dist --host= --target $TARGETS,i586-unknown-linux-musl"
Loading
Loading