Skip to content

Fix hardcoded strip path when cross-compiling from Linux to Darwin #131480

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Oct 10, 2024

Conversation

madsmtm
Copy link
Contributor

@madsmtm madsmtm commented Oct 10, 2024

Fixes #131206.

I fear that #131405 might end up taking some time, so opening this PR to resolve the regression.

@rustbot label O-apple

@rustbot
Copy link
Collaborator

rustbot commented Oct 10, 2024

r? @nnethercote

rustbot has assigned @nnethercote.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added 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. O-apple Operating system: Apple (macOS, iOS, tvOS, visionOS, watchOS) labels Oct 10, 2024
@nnethercote
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Oct 10, 2024

📌 Commit 09b634a has been approved by nnethercote

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 Oct 10, 2024
@jieyouxu
Copy link
Member

jieyouxu commented Oct 10, 2024

Does this need a backport? EDIT: no I think it's fine because the beta bump happens later and this should land before that.

bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 10, 2024
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#130625 (Fix a few relative paths in rustc doc)
 - rust-lang#131397 (fix/update teach_note from 'escaping mutable ref/ptr' const-check)
 - rust-lang#131479 (Apple: Avoid redundant `-Wl,-dylib` flag when linking)
 - rust-lang#131480 (Fix hardcoded strip path when cross-compiling from Linux to Darwin)
 - rust-lang#131482 (structurally resolve adts and tuples expectations too)
 - rust-lang#131484 (Add myself back to review rotation)
 - rust-lang#131491 (impossible obligations fast path)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6831362 into rust-lang:master Oct 10, 2024
6 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Oct 10, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 10, 2024
Rollup merge of rust-lang#131480 - madsmtm:macos-fix-strip-binary, r=nnethercote

Fix hardcoded strip path when cross-compiling from Linux to Darwin

Fixes rust-lang#131206.

I fear that rust-lang#131405 might end up taking some time, so opening this PR to resolve the regression.

`@rustbot` label O-apple
@madsmtm madsmtm deleted the macos-fix-strip-binary branch October 10, 2024 15:38
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
O-apple Operating system: Apple (macOS, iOS, tvOS, visionOS, watchOS) 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Hard-coded strip path breaks Linux -> Darwin builds
6 participants