diff options
| author | bors <bors@rust-lang.org> | 2025-09-15 23:12:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-09-15 23:12:06 +0000 |
| commit | 9d82de19dfae60e55c291f5f28e28cfc2c1b9630 (patch) | |
| tree | 344a13e2d701b81b570acabfb01274794c340cbd /src/bootstrap/bootstrap.py | |
| parent | a454fccb02df9d361f1201b747c01257f58a8b37 (diff) | |
| parent | 8f2b6029f5eacfc2158877bf021ebb738fa7453f (diff) | |
Auto merge of #146610 - matthiaskrgr:rollup-xkt5kjz, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - rust-lang/rust#146344 (tests/codegen-llvm: Make rust-abi-arch-specific-adjustment portable) - rust-lang/rust#146530 (rustc_codegen_llvm: Adjust RISC-V inline assembly's clobber list) - rust-lang/rust#146533 (Note some previous attempts to change the Default impl for `[T; 0]`) - rust-lang/rust#146539 (fix 404 MCP link) - rust-lang/rust#146546 (Switch `std::vec::PeekMut::pop` from self to this parameter.) - rust-lang/rust#146549 (On FreeBSD, use readdir instead of readdir_r) - rust-lang/rust#146559 (Fix typo in error message) - rust-lang/rust#146563 (bootstrap.py: disable incremental build for bootstrap in CI) - rust-lang/rust#146576 (opt-dist: don't set `RUST_LOG=collector=debug`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/bootstrap/bootstrap.py')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 2ece53eb0cc..e017cfe6aef 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -1039,6 +1039,9 @@ class RustBuild(object): # See also: <https://github.com/rust-lang/rust/issues/70208>. if "CARGO_BUILD_TARGET" in env: del env["CARGO_BUILD_TARGET"] + # if in CI, don't use incremental build when building bootstrap. + if "GITHUB_ACTIONS" in env: + env["CARGO_INCREMENTAL"] = "0" env["CARGO_TARGET_DIR"] = build_dir env["RUSTC"] = self.rustc() env["LD_LIBRARY_PATH"] = ( |