diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2023-04-18 14:50:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-18 14:50:52 +0200 |
| commit | aa1247ab20765142afcdb847f39fee4e1727ecf3 (patch) | |
| tree | 37f4750d73b16a6fa485ed57511a929e1c15c26b /src | |
| parent | e6b607335ab1627200ca7fe35f52ba2f4d4d3653 (diff) | |
| parent | ce5d897eb62f85db5b0821428323bb2e2673443c (diff) | |
| download | rust-aa1247ab20765142afcdb847f39fee4e1727ecf3.tar.gz rust-aa1247ab20765142afcdb847f39fee4e1727ecf3.zip | |
Rollup merge of #110485 - albertlarsan68:fix-bootstrap-lock, r=ozkanonur
Fix bootstrap locking Fix the regression introduced in #108607 Fixes #109967
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/bin/main.rs | 6 |
1 files changed, 4 insertions, 2 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() { |