Skip to content

Commit 6f7c25d

Browse files
committed
Auto merge of rust-lang#140273 - matthiaskrgr:rollup-rxmuvkg, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - rust-lang#137096 (Stabilize flags for doctest cross compilation) - rust-lang#140148 (CI: use aws codebuild for job dist-arm-linux) - rust-lang#140187 ([AIX] Handle AIX dynamic library extensions within c-link-to-rust-dylib run-make test) - rust-lang#140196 (Improved diagnostics for non-primitive cast on non-primitive types (`Arc`, `Option`)) - rust-lang#140210 (Work around cygwin issue on condvar timeout) - rust-lang#140213 (mention about `x.py setup` in `INSTALL.md`) - rust-lang#140229 (`DelimArgs` tweaks) - rust-lang#140248 (Fix impl block items indent) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 558461d + addf27c commit 6f7c25d

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

std/src/sys/pal/unix/sync/condvar.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,10 @@ impl Condvar {
6464
// https://gist.github.com/stepancheg/198db4623a20aad2ad7cddb8fda4a63c
6565
//
6666
// To work around this issue, the timeout is clamped to 1000 years.
67-
#[cfg(target_vendor = "apple")]
67+
//
68+
// Cygwin implementation is based on NT API and a super large timeout
69+
// makes the syscall block forever.
70+
#[cfg(any(target_vendor = "apple", target_os = "cygwin"))]
6871
let dur = Duration::min(dur, Duration::from_secs(1000 * 365 * 86400));
6972

7073
let timeout = Timespec::now(Self::CLOCK).checked_add_duration(&dur);

0 commit comments

Comments
 (0)