Add deployment-target --print flag for Apple targets #105354
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
|
These commits modify compiler targets. |
BlackHoleFox
force-pushed
the
apple-deployment-printer
branch
from
e8476f8
to
2e85d23
Compare
|
@rustbot label O-macos O-ios |
|
So far I'm unsure of the flag name. |
BlackHoleFox
force-pushed
the
apple-deployment-printer
branch
2 times, most recently
from
2d1db73
to
149846e
Compare
|
r? compiler |
|
r? @oli-obk |
oli-obk
requested changes
Dec 16, 2022
|
This adds a new insta-stable compiler flag. This seems like a good solution to the problem for me. @rfcbot fcp merge |
|
Team member @oli-obk has proposed to merge this. The next step is review by the rest of the tagged team members:
No concerns currently listed. Once a majority of reviewers approve (and at most 2 approvals are outstanding), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up! See this document for info about what commands tagged team members can give me. |
rfcbot
added
proposed-final-comment-period
lcnr
reviewed
Dec 16, 2022
| "ios" => ios_deployment_target(), | ||
| "watchos" => watchos_deployment_target(), | ||
| "tvos" => tvos_deployment_target(), | ||
| _ => unreachable!("unknown Apple target OS"), |
There was a problem hiding this comment.
This arm is reachable with custom target specs.
I suggest returning an Option here, and relying on it in the driver instead of using sess.target.is_like_osx.
There was a problem hiding this comment.
Ah, thanks, and good to know. Moved up to rustc_driver. For the future, why is doing it there better? Do custom target specs go through a different codepath that wouldn't panic?
BlackHoleFox
force-pushed
the
apple-deployment-printer
branch
from
149846e
to
95075d9
Compare
This comment has been minimized.
This comment has been minimized.
BlackHoleFox
force-pushed
the
apple-deployment-printer
branch
from
95075d9
to
cb5927c
Compare
rustbot
added
the
A-testsuite
|
There's now also a test for valid use of the new flag. It isn't very picky about the output beyond requiring that it only contains |
bors
added
the
S-waiting-on-bors
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
May 4, 2023
…ter, r=oli-obk Add deployment-target --print flag for Apple targets This is very useful for crates that need to know what the Apple OS deployment target is for their build scripts or inside of a build environment. Right now, the defaults just get copy/pasted around the ecosystem since they've been stable for so long. But with rust-lang#104385 in progress, that won't be true anymore and everything will need to move. Ideally whenever it happens again, this could be less painful as everything can ask the compiler what its default is instead. To show examples of the copy/paste proliferation, here's some crates and/or apps that do: - [cc](https://github.com/rust-lang/cc-rs/pull/708/files), Soon - [mac-notification-sys](https://github.com/h4llow3En/mac-notification-sys/pull/46/files#diff-d0d98998092552a1d3259338c2c71e118a5b8343dd4703c0c7f552ada7f9cb42R10-R12) - [PyO3](https://github.com/PyO3/maturin/blob/ccb02d1aa1cc41e82a3572a3c8b35cace15f3e78/src/target.rs#L755-L758) - [Anki](https://github.com/ankitects/anki/blob/613b5c1034cc9943f3f68d818ae22b2e0acec877/build/runner/src/bundle/artifacts.rs#L49-L54) - [jsc-rs](https://github.com/Brooooooklyn/jsc-rs/blob/37767267568fb2de62fc441473e7d158dd980520/xtask/src/build.rs#L402-L405) ... and probably more that a simple GitHub codesearch didn't see
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
May 4, 2023
…ter, r=oli-obk Add deployment-target --print flag for Apple targets This is very useful for crates that need to know what the Apple OS deployment target is for their build scripts or inside of a build environment. Right now, the defaults just get copy/pasted around the ecosystem since they've been stable for so long. But with rust-lang#104385 in progress, that won't be true anymore and everything will need to move. Ideally whenever it happens again, this could be less painful as everything can ask the compiler what its default is instead. To show examples of the copy/paste proliferation, here's some crates and/or apps that do: - [cc](https://github.com/rust-lang/cc-rs/pull/708/files), Soon - [mac-notification-sys](https://github.com/h4llow3En/mac-notification-sys/pull/46/files#diff-d0d98998092552a1d3259338c2c71e118a5b8343dd4703c0c7f552ada7f9cb42R10-R12) - [PyO3](https://github.com/PyO3/maturin/blob/ccb02d1aa1cc41e82a3572a3c8b35cace15f3e78/src/target.rs#L755-L758) - [Anki](https://github.com/ankitects/anki/blob/613b5c1034cc9943f3f68d818ae22b2e0acec877/build/runner/src/bundle/artifacts.rs#L49-L54) - [jsc-rs](https://github.com/Brooooooklyn/jsc-rs/blob/37767267568fb2de62fc441473e7d158dd980520/xtask/src/build.rs#L402-L405) ... and probably more that a simple GitHub codesearch didn't see
|
Failed in rollup: #111219 (comment) |
bors
added
S-waiting-on-author
BlackHoleFox
force-pushed
the
apple-deployment-printer
branch
from
1e45f08
to
a427d41
Compare
|
Should be ready again, the UI test wasn't flexible enough before to handle different deployment versions. I fixed that and tried it out locally with multiple @rustbot ready |
rustbot
added
S-waiting-on-review
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 8, 2023
Rollup of 7 pull requests Successful merges: - rust-lang#105354 (Add deployment-target --print flag for Apple targets) - rust-lang#110377 (Update max_atomic_width of armv7r and armv7_sony_vita targets to 64.) - rust-lang#110638 (STD support for PSVita) - rust-lang#111211 (Don't compute trait super bounds unless they're positive) - rust-lang#111315 (Remove `identity_future` from stdlib) - rust-lang#111331 (Mark s390x condition code register as clobbered in inline assembly) - rust-lang#111332 (Improve inline asm for LoongArch) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is very useful for crates that need to know what the Apple OS deployment target is for their build scripts or inside of a build environment. Right now, the defaults just get copy/pasted around the ecosystem since they've been stable for so long. But with #104385 in progress, that won't be true anymore and everything will need to move. Ideally whenever it happens again, this could be less painful as everything can ask the compiler what its default is instead.
To show examples of the copy/paste proliferation, here's some crates and/or apps that do:
... and probably more that a simple GitHub codesearch didn't see