diff options
| -rw-r--r-- | src/bootstrap/src/core/build_steps/test.rs | 6 | ||||
| -rw-r--r-- | src/ci/docker/host-x86_64/x86_64-gnu-distcheck/Dockerfile | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs index ac882a8944a..a6035bfc9da 100644 --- a/src/bootstrap/src/core/build_steps/test.rs +++ b/src/bootstrap/src/core/build_steps/test.rs @@ -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); diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-distcheck/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-distcheck/Dockerfile index a2dd37f1efb..5bafd89cfd9 100644 --- a/src/ci/docker/host-x86_64/x86_64-gnu-distcheck/Dockerfile +++ b/src/ci/docker/host-x86_64/x86_64-gnu-distcheck/Dockerfile @@ -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 |