itsscb/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-10-02 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not forward CI configure arguments to distcheck builds

Browse Source
This commit is contained in:
Jakub Beránek 2025-08-25 12:32:13 +02:00
parent 89f9cf31d1
commit 8fa5fc63ba
No known key found for this signature in database
GPG Key ID: 909CD0D26483516B
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bootstrap/src/core/build_steps/test.rs
View File

@ -3127,6 +3127,10 @@ impl Step for Distcheck {
let plain_src_dir = root_dir.join("distcheck-plain-src");
builder.clear_dir(&plain_src_dir);
let configure_args: Vec<String> = std::env::var("DISTCHECK_CONFIGURE_ARGS")
.map(|args| args.split(" ").map(|s| s.to_string()).collect::<Vec<String>>())
.unwrap_or(vec![]);
command("tar")
.arg("-xf")
.arg(plain_src_tarball.tarball())
@ -3136,7 +3140,7 @@ impl Step for Distcheck {
command("./configure")
.arg("--set")
.arg("rust.omit-git-hash=false")
.args(&builder.config.configure_args)
.args(&configure_args)
.arg("--enable-vendor")
.current_dir(&plain_src_dir)
.run(builder);

3
src/ci/docker/host-x86_64/x86_64-gnu-distcheck/Dockerfile
View File

@ -33,4 +33,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh
# Make distcheck builds faster
ENV DISTCHECK_CONFIGURE_ARGS "--enable-sccache"
ENV SCRIPT python3 ../x.py test distcheck