[WIP] Use /usr/bin/strip on macOS -> iOS cross as a temporary mitigation
#138250
+9
−1
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
For <rust-lang#138212>. Looks like LLVM 20's initial `llvm-objcopy` version that we ship as `rust-objcopy` may be producing stripped iOS binaries with invalid offsets that fail iOS platform consistency checks. For the time being, use macOS system strip at `/usr/bin/strip` which should be available (unlike Linux -> macOS cross where this is not guaranteed to be available, partially why we are shipping `llvm-objcopy` in the first place) that shouldn't have this offset problem.
rustbot
added
S-waiting-on-review
|
@bors try |
jieyouxu
added
S-waiting-on-author
|
⌛ Trying commit 908c5e4 with merge 06d1077d5ba6da9a0b3b6b84e6f919ec600dc1b6... |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 9, 2025
[WIP] Use `/usr/bin/strip` on macOS -> iOS cross as a temporary mitigation Mitigation for <rust-lang#138212>. This reintroduces the "hard-coded strip" workaround (but only for iOS) that was initially introduced in rust-lang#130781. Looks like LLVM 20's initial `llvm-objcopy` version that we ship as `rust-objcopy` may be producing stripped iOS binaries with invalid offsets that fail iOS platform consistency checks. For the time being, use macOS system strip at `/usr/bin/strip` which should be available (unlike Linux -> macOS cross where this is not guaranteed to be available, partially why we are shipping `llvm-objcopy` in the first place[^linux-darwin-cross]) that shouldn't have this offset problem. ### Review and testing advice I don't have access to either macOS or iOS platforms, and I can't really write a test for this. This will need to be tested manually. r? `@davidtwco` (or reroll) cc *-apple-ios target maintainers `@badboy` `@deg4uss3r` `@madsmtm` try-job: dist-apple-various try-job: dist-x86_64-apple [^linux-darwin-cross]: rust-lang#131206
|
☀️ Try build successful - checks-actions |
madsmtm
approved these changes
Mar 9, 2025
There was a problem hiding this comment.
Fine with this workaround (depending on how long llvm/llvm-project#130472 takes).
| @@ -1046,7 +1046,15 @@ fn link_natively( | |||
| let strip = sess.opts.cg.strip; | |||
|
|
|||
| if sess.target.is_like_osx { | |||
| let stripcmd = "rust-objcopy"; | |||
| let stripcmd = if sess.target.os == "ios" { | |||
There was a problem hiding this comment.
I'd prefer something like:
Suggested change
| let stripcmd = if sess.target.os == "ios" { | |
| let stripcmd = if cfg!(target_os = "macos") && sess.target.os != "macos" { |
To not further break cross-compilation from Linux->iOS (which is rare, but possible), and to also fix this on tvOS, watchOS and visionOS.
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.
Mitigation for #138212. This reintroduces the "hard-coded strip" workaround (but only for iOS) that was initially introduced in #130781.
Looks like LLVM 20's initial
llvm-objcopyversion that we ship asrust-objcopymay be producing stripped iOS binaries with invalid offsets that fail iOS platform consistency checks.For the time being, use macOS system strip at
/usr/bin/stripwhich should be available (unlike Linux -> macOS cross where this is not guaranteed to be available, partially why we are shippingllvm-objcopyin the first place1) that shouldn't have this offset problem.Alternative mitigations
We could also try to use a
stripfrom PATH. However, that can regress iOS users if they have broken homebrew binutils strip in their PATH that take precedence over a "good" strip.Review and testing advice
I don't have access to either macOS or iOS platforms, and I can't really write a test for this. This will need to be tested manually.
r? @davidtwco (or reroll)
cc *-apple-ios target maintainers @badboy @deg4uss3r @madsmtm
try-job: dist-apple-various
try-job: dist-x86_64-apple
Footnotes
https://github.com/rust-lang/rust/issues/131206 ↩