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

Fix bootstrap locking Fix the regression introduced in #108607 Fixes #109967
rust-lang · Apr 18, 2023 · aa1247a · aa1247a
2 parents e6b6073 + ce5d897
commit aa1247a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/bootstrap/bin/main.rs b/src/bootstrap/bin/main.rs
@@ -15,10 +15,12 @@ fn main() {
     let args = env::args().skip(1).collect::<Vec<_>>();
     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() {