Skip to content

Commit aa1247a

Browse files
Rollup merge of #110485 - albertlarsan68:fix-bootstrap-lock, r=ozkanonur
Fix bootstrap locking Fix the regression introduced in #108607 Fixes #109967
2 parents e6b6073 + ce5d897 commit aa1247a

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/bootstrap/bin/main.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ fn main() {
1515
let args = env::args().skip(1).collect::<Vec<_>>();
1616
let config = Config::parse(&args);
1717

18+
#[cfg(all(any(unix, windows), not(target_os = "solaris")))]
19+
let mut build_lock;
20+
#[cfg(all(any(unix, windows), not(target_os = "solaris")))]
21+
let _build_lock_guard;
1822
#[cfg(all(any(unix, windows), not(target_os = "solaris")))]
1923
{
20-
let mut build_lock;
21-
let _build_lock_guard;
2224
let path = config.out.join("lock");
2325
build_lock = fd_lock::RwLock::new(t!(std::fs::File::create(&path)));
2426
_build_lock_guard = match build_lock.try_write() {

0 commit comments

Comments
 (0)