bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #110485 - albertlarsan68:fix-bootstrap-lock, r=ozkanonur

Browse source 
Fix bootstrap locking

Fix the regression introduced in #108607

Fixes #109967
This commit is contained in:
Guillaume Gomez 2023-04-18 14:50:52 +02:00 • committed by GitHub
commit aa1247ab20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/bootstrap/bin/main.rs
View file

@ -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 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() {