diff options
| author | Jakub Beránek <berykubik@gmail.com> | 2025-08-25 12:32:13 +0200 |
|---|---|---|
| committer | Jakub Beránek <berykubik@gmail.com> | 2025-08-25 12:32:13 +0200 |
| commit | 8fa5fc63baa449a7d04719f34c819fe82809cf9b (patch) | |
| tree | ae79748d867bac16611ec5d45f74971e1eaecd47 /src/bootstrap | |
| parent | 89f9cf31d1d8795a87c9b107a43bb0ff497082f3 (diff) | |
| download | rust-8fa5fc63baa449a7d04719f34c819fe82809cf9b.tar.gz rust-8fa5fc63baa449a7d04719f34c819fe82809cf9b.zip | |
Do not forward CI configure arguments to `distcheck` builds
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/src/core/build_steps/test.rs | 6 |
1 files changed, 5 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); |
