Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-04-27 18:57:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #153371 - homersimpsons:chore/fix-LegacyKeyValueFormat-arm, r=marcoieni

Browse Source 
Fix LegacyKeyValueFormat report from docker build: arm

Part of rust-lang/rust#152305

r? @marcoieni
This commit is contained in:
Jonathan Brouwer
2026-03-07 01:42:37 +01:00
committed by GitHub
parent cecc5e7cea b89deb41bf
commit ec5e4aacbc
7 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ci/docker/host-x86_64/arm-android/Dockerfile
+2 -2
View File
@@ -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
src/ci/docker/host-x86_64/armhf-gnu/Dockerfile
+2 -2
View File
@@ -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
src/ci/docker/host-x86_64/dist-arm-linux-gnueabi/Dockerfile
+3 -4
View File
@@ -27,9 +27,8 @@ ENV CC_arm_unknown_linux_gnueabi=arm-unknown-linux-gnueabi-gcc \
ENV HOSTS=arm-unknown-linux-gnueabi
ENV RUST_CONFIGURE_ARGS \
--enable-full-tools \
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"
src/ci/docker/host-x86_64/dist-arm-linux-musl/Dockerfile
+3 -4
View File
@@ -18,11 +18,10 @@ RUN sh /scripts/sccache.sh
ENV HOSTS=aarch64-unknown-linux-musl
ENV RUST_CONFIGURE_ARGS \
--enable-full-tools \
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"
src/ci/docker/host-x86_64/dist-armhf-linux/Dockerfile
+2 -2
View File
@@ -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"
src/ci/docker/host-x86_64/dist-armv7-linux/Dockerfile
+2 -2
View File
@@ -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"
src/ci/docker/host-x86_64/dist-ohos-armv7/Dockerfile
+3 -4
View File
@@ -40,14 +40,13 @@ ENV \
AR_armv7_unknown_linux_ohos=/opt/ohos-sdk/native/llvm/bin/llvm-ar \
CXX_armv7_unknown_linux_ohos=/usr/local/bin/armv7-unknown-linux-ohos-clang++.sh
ENV RUST_CONFIGURE_ARGS \
--enable-profiler \
ENV RUST_CONFIGURE_ARGS="--enable-profiler \
--disable-docs \
--tools=cargo,clippy,rustdocs,rustfmt,rust-analyzer,rust-analyzer-proc-macro-srv,analysis,src,wasm-component-ld \
--enable-extended \
--enable-sanitizers
--enable-sanitizers"
ENV SCRIPT python3 ../x.py dist --host=$TARGETS --target $TARGETS
ENV SCRIPT="python3 ../x.py dist --host=$TARGETS --target $TARGETS"
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh