diff options
| author | bors <bors@rust-lang.org> | 2023-04-18 18:05:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-18 18:05:18 +0000 |
| commit | 4e463012580415a932ae4fc255aff45982c70369 (patch) | |
| tree | 8348890ca896b293cd47e8abcdab5102401d978b /src/bootstrap | |
| parent | de96f3d8735b70d5dc1ca178aaee198b329b8f3d (diff) | |
| parent | e8f7b5a0b2d6dcde407a8a95b5afc69114198edc (diff) | |
| download | rust-4e463012580415a932ae4fc255aff45982c70369.tar.gz rust-4e463012580415a932ae4fc255aff45982c70369.zip | |
Auto merge of #110492 - GuillaumeGomez:rollup-n4tpbl4, r=GuillaumeGomez
Rollup of 5 pull requests Successful merges: - #110417 (Spelling compiler) - #110441 (5 little typos) - #110485 (Fix bootstrap locking) - #110488 (Add a failing rustdoc-ui test for public infinite recursive type) - #110490 (Bump `download-ci-llvm-stamp` for loong support) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/bin/main.rs | 6 | ||||
| -rw-r--r-- | src/bootstrap/download-ci-llvm-stamp | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/bootstrap/bin/main.rs b/src/bootstrap/bin/main.rs index 912d875e445..a80379e85c1 100644 --- a/src/bootstrap/bin/main.rs +++ b/src/bootstrap/bin/main.rs @@ -16,9 +16,11 @@ fn main() { let config = Config::parse(&args); #[cfg(all(any(unix, windows), not(target_os = "solaris")))] + let mut build_lock; + #[cfg(all(any(unix, windows), not(target_os = "solaris")))] + let _build_lock_guard; + #[cfg(all(any(unix, windows), not(target_os = "solaris")))] { - let mut build_lock; - let _build_lock_guard; let path = config.out.join("lock"); build_lock = fd_lock::RwLock::new(t!(std::fs::File::create(&path))); _build_lock_guard = match build_lock.try_write() { diff --git a/src/bootstrap/download-ci-llvm-stamp b/src/bootstrap/download-ci-llvm-stamp index 36f9aaa595d..4111b7cc0d3 100644 --- a/src/bootstrap/download-ci-llvm-stamp +++ b/src/bootstrap/download-ci-llvm-stamp @@ -1,4 +1,4 @@ Change this file to make users of the `download-ci-llvm` configuration download a new version of LLVM from CI, even if the LLVM submodule hasn’t changed. -Last change is for: https://github.com/rust-lang/rust/pull/109373 +Last change is for: https://github.com/rust-lang/rust/pull/96971 |