diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2025-04-27 18:53:00 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-27 18:53:00 +0900 |
| commit | d91ffb6da5c306150e53f73a361f69837bc39851 (patch) | |
| tree | ee6518c803de044596ce0e095d38bd7cab0f4a57 /library/std/src/sys/process/unix/unix.rs | |
| parent | 89bb181106817c7828c16dc75ce5b2a367664471 (diff) | |
| parent | 1b315ad92df192895fb2d1f0532270c54f6f8436 (diff) | |
| download | rust-d91ffb6da5c306150e53f73a361f69837bc39851.tar.gz rust-d91ffb6da5c306150e53f73a361f69837bc39851.zip | |
Merge pull request #2351 from rust-lang/rustc-pull
Diffstat (limited to 'library/std/src/sys/process/unix/unix.rs')
| -rw-r--r-- | library/std/src/sys/process/unix/unix.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/library/std/src/sys/process/unix/unix.rs b/library/std/src/sys/process/unix/unix.rs index 3b04ec50db3..92bb809d90c 100644 --- a/library/std/src/sys/process/unix/unix.rs +++ b/library/std/src/sys/process/unix/unix.rs @@ -415,6 +415,7 @@ impl Command { all(target_os = "linux", target_env = "musl"), target_os = "nto", target_vendor = "apple", + target_os = "cygwin", )))] fn posix_spawn( &mut self, @@ -433,6 +434,7 @@ impl Command { all(target_os = "linux", target_env = "musl"), target_os = "nto", target_vendor = "apple", + target_os = "cygwin", ))] fn posix_spawn( &mut self, @@ -584,7 +586,7 @@ impl Command { /// Some platforms can set a new working directory for a spawned process in the /// `posix_spawn` path. This function looks up the function pointer for adding /// such an action to a `posix_spawn_file_actions_t` struct. - #[cfg(not(all(target_os = "linux", target_env = "musl")))] + #[cfg(not(any(all(target_os = "linux", target_env = "musl"), target_os = "cygwin")))] fn get_posix_spawn_addchdir() -> Option<PosixSpawnAddChdirFn> { use crate::sys::weak::weak; @@ -618,7 +620,9 @@ impl Command { /// Weak symbol lookup doesn't work with statically linked libcs, so in cases /// where static linking is possible we need to either check for the presence /// of the symbol at compile time or know about it upfront. - #[cfg(all(target_os = "linux", target_env = "musl"))] + /// + /// Cygwin doesn't support weak symbol, so just link it. + #[cfg(any(all(target_os = "linux", target_env = "musl"), target_os = "cygwin"))] fn get_posix_spawn_addchdir() -> Option<PosixSpawnAddChdirFn> { // Our minimum required musl supports this function, so we can just use it. Some(libc::posix_spawn_file_actions_addchdir_np) |