mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #123721 - madsmtm:fix-visionos, r=davidtwco

Browse Source 
Various visionOS fixes

A few small mistakes was introduced in https://github.com/rust-lang/rust/pull/121419, probably after the rename from `xros` to `visionos`. See the commits for details.

CC `@agg23`

Since you reviewed https://github.com/rust-lang/rust/pull/121419
r? davidtwco
This commit is contained in:
Guillaume Gomez 2024-04-16 15:19:13 +02:00 committed by GitHub
commit 1c8bdb93d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/rustc_codegen_ssa/src/back/link.rs
View File

@ -3038,9 +3038,10 @@ fn get_apple_sdk_root(sdk_name: &str) -> Result<String, errors::AppleSdkRootErro
|| sdkroot.contains("MacOSX.platform") => {} || sdkroot.contains("MacOSX.platform") => {}
"watchsimulator" "watchsimulator"
if sdkroot.contains("WatchOS.platform") || sdkroot.contains("MacOSX.platform") => {} if sdkroot.contains("WatchOS.platform") || sdkroot.contains("MacOSX.platform") => {}
"visionos" "xros"
if sdkroot.contains("XROS.platform") || sdkroot.contains("MacOSX.platform") => {} if sdkroot.contains("XRSimulator.platform")
"visionossimulator" || sdkroot.contains("MacOSX.platform") => {}
"xrsimulator"
if sdkroot.contains("XROS.platform") || sdkroot.contains("MacOSX.platform") => {} if sdkroot.contains("XROS.platform") || sdkroot.contains("MacOSX.platform") => {}
// Ignore `SDKROOT` if it's not a valid path. // Ignore `SDKROOT` if it's not a valid path.
_ if !p.is_absolute() || p == Path::new("/") || !p.exists() => {} _ if !p.is_absolute() || p == Path::new("/") || !p.exists() => {}

1
compiler/rustc_target/src/spec/base/apple/mod.rs
View File

@ -298,6 +298,7 @@ fn link_env_remove(os: &'static str) -> StaticCow<[StaticCow<str>]> {
|| sdkroot.contains("WatchOS.platform") || sdkroot.contains("WatchOS.platform")
|| sdkroot.contains("WatchSimulator.platform") || sdkroot.contains("WatchSimulator.platform")
|| sdkroot.contains("XROS.platform") || sdkroot.contains("XROS.platform")
|| sdkroot.contains("XRSimulator.platform")
{ {
env_remove.push("SDKROOT".into()) env_remove.push("SDKROOT".into())
} }

13
library/std/src/sys/pal/unix/process/process_unix.rs
View File

@ -11,18 +11,6 @@ use crate::os::linux::process::PidFd;
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
use crate::os::unix::io::AsRawFd; use crate::os::unix::io::AsRawFd;
#[cfg(any(
target_os = "macos",
target_os = "watchos",
target_os = "visionos",
target_os = "tvos",
target_os = "freebsd",
all(target_os = "linux", target_env = "gnu"),
all(target_os = "linux", target_env = "musl"),
target_os = "nto",
))]
use crate::sys::weak::weak;
#[cfg(target_os = "vxworks")] #[cfg(target_os = "vxworks")]
use libc::RTP_ID as pid_t; use libc::RTP_ID as pid_t;
@ -466,6 +454,7 @@ impl Command {
envp: Option<&CStringArray>, envp: Option<&CStringArray>,
) -> io::Result<Option<Process>> { ) -> io::Result<Option<Process>> {
use crate::mem::MaybeUninit; use crate::mem::MaybeUninit;
use crate::sys::weak::weak;
use crate::sys::{self, cvt_nz, unix_sigpipe_attr_specified}; use crate::sys::{self, cvt_nz, unix_sigpipe_attr_specified};
if self.get_gid().is_some() if self.get_gid().is_some()