Skip to content

Various visionOS fixes#123721

Merged
bors merged 3 commits into
rust-lang:masterfrom
madsmtm:fix-visionos
Apr 16, 2024
Merged

Various visionOS fixes#123721
bors merged 3 commits into
rust-lang:masterfrom
madsmtm:fix-visionos

Conversation

@madsmtm

@madsmtm madsmtm commented Apr 10, 2024

Copy link
Copy Markdown
Contributor

A few small mistakes was introduced in #121419, probably after the rename from xros to visionos. See the commits for details.

CC @agg23

Since you reviewed #121419
r? davidtwco

madsmtm added 2 commits April 10, 2024 15:04
The `sdk_name` is `xros`/`xrsimulator`, not `visionos`/`visionossimulator`.
The import is used once in this file, inside `posix_spawn`, so let's move the import into that function instead, to reduce the number of `cfg`s that need to be kept in sync.
@rustbot rustbot added O-unix Operating system: Unix-like S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Apr 10, 2024
@QuentinPerez

Copy link
Copy Markdown
Contributor

I was digging this bug thx !

@agg23

agg23 commented Apr 10, 2024

Copy link
Copy Markdown
Contributor

Yep that's the rename, sorry.

envp: Option<&CStringArray>,
) -> io::Result<Option<Process>> {
use crate::mem::MaybeUninit;
use crate::sys::weak::weak;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this change for and how is it related?

@madsmtm madsmtm Apr 10, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

./x build library --target=aarch64-apple-visions throws a warning (that gets converted to an error) because the imported weak is unused - see the commit for the change for details.

Checking this was missing from the `link_env_remove` function, so compilation might fail if set when compiling for macOS
@rustbot

rustbot commented Apr 10, 2024

Copy link
Copy Markdown
Collaborator

These commits modify compiler targets.
(See the Target Tier Policy.)

@madsmtm madsmtm changed the title visionOS: Fix logic for finding the SDK root Various visionOS fixes Apr 10, 2024
@davidtwco

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Apr 16, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 1a72384 has been approved by davidtwco

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 16, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 16, 2024
…llaumeGomez

Rollup of 14 pull requests

Successful merges:

 - rust-lang#120781 (Correct usage note on OpenOptions::append())
 - rust-lang#121694 (sess: stabilize `-Zrelro-level` as `-Crelro-level`)
 - rust-lang#122521 (doc(bootstrap): add top-level doc-comment to utils/tarball.rs)
 - rust-lang#123491 (Fix ICE in `eval_body_using_ecx`)
 - rust-lang#123574 (rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 6))
 - rust-lang#123687 (Update ar_archive_writer to 0.2.0)
 - rust-lang#123721 (Various visionOS fixes)
 - rust-lang#123797 (Better graphviz output for SCCs and NLL constraints)
 - rust-lang#123990 (Make `suggest_deref_closure_return` more idiomatic/easier to understand)
 - rust-lang#123995 (Make `thir_tree` and `thir_flat` into hooks)
 - rust-lang#123998 (Opaque types have no namespace)
 - rust-lang#124001 (Fix docs for unstable_features lint.)
 - rust-lang#124006 (Move size assertions for `mir::syntax` types into the same file)
 - rust-lang#124011 (rustdoc: update the module-level docs of `rustdoc::clean`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 1c8bdb9 into rust-lang:master Apr 16, 2024
@rustbot rustbot added this to the 1.79.0 milestone Apr 16, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 16, 2024
Rollup merge of rust-lang#123721 - madsmtm:fix-visionos, r=davidtwco

Various visionOS fixes

A few small mistakes was introduced in rust-lang#121419, probably after the rename from `xros` to `visionos`. See the commits for details.

CC `@agg23`

Since you reviewed rust-lang#121419
r? davidtwco
@madsmtm madsmtm deleted the fix-visionos branch April 16, 2024 16:59
@madsmtm madsmtm restored the fix-visionos branch April 16, 2024 16:59
@madsmtm madsmtm deleted the fix-visionos branch April 16, 2024 17:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

O-unix Operating system: Unix-like S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants