Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Apple: Fix direct linking with +verbatim #132394

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Apple: Fix direct linking with +verbatim #132394

wants to merge 1 commit into from

Conversation

madsmtm
Copy link
Contributor

@madsmtm madsmtm commented Oct 31, 2024 •
edited by jieyouxu
Loading

Linking with +verbatim somewhat worked before, but only when the library was included as part of an rlib.

Fixes #132264.

CC @petrochenkov, since you've worked on +verbatim before.

@rustbot label O-apple A-linkage

try-job: aarch64-apple
try-job: x86_64-apple-2

@rustbot
Copy link
Collaborator

rustbot commented Oct 31, 2024

r? @jieyouxu

rustbot has assigned @jieyouxu.
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 A-run-make Area: port run-make Makefiles to rmake.rs 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. labels Oct 31, 2024
@rustbot
Copy link
Collaborator

rustbot commented Oct 31, 2024

This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.

cc @jieyouxu

@rustbot rustbot added A-linkage Area: linking into static, shared libraries and binaries O-apple Operating system: Apple (macOS, iOS, tvOS, visionOS, watchOS) labels Oct 31, 2024
madsmtm
madsmtm commented Oct 31, 2024
View reviewed changes
tests/run-make/native-link-modifier-verbatim-linker/rmake.rs
Comment on lines -6 to -7
//@ ignore-apple
// Reason: linking fails due to the unusual ".ext" staticlib name.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This ignore was added in #101806, and only later rationalized when converting to rmake.

@jieyouxu
Copy link
Member

The changes itself looks reasonable to me, but I don't know the implications of +verbatim so:

r? @petrochenkov

@rustbot rustbot assigned petrochenkov and unassigned jieyouxu Oct 31, 2024
@jieyouxu

This comment was marked as outdated.

Sign in to view
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 31, 2024
@bors
Auto merge of rust-lang#132394 - madsmtm:fix-apple-verbatim-link, r=<…
9f32c44 
…try>

Apple: Fix direct linking with +verbatim

Linking with `+verbatim` somewhat worked before, but only when the library was included as part of an rlib.

Fixes rust-lang#132264.

CC `@petrochenkov,` since you've worked on `+verbatim` before.

`@rustbot` label O-apple A-linkage

try-job: aarch64-apple
try-job: x86_64-apple-2
@bors

This comment was marked as outdated.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors

This comment was marked as resolved.

Sign in to view
@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 31, 2024
@madsmtm
Apple: Fix direct linking with +verbatim
71a8af9 
Linking with +verbatim somewhat worked before, but only when the library
was included as part of an rlib.
@madsmtm madsmtm force-pushed the fix-apple-verbatim-link branch from 3cb4340 to 71a8af9 Compare October 31, 2024 08:51
@madsmtm
Copy link
Contributor Author

madsmtm commented Oct 31, 2024

Fixed the tidy error now

@jieyouxu
Copy link
Member

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 31, 2024
@bors
Auto merge of rust-lang#132394 - madsmtm:fix-apple-verbatim-link, r=<…
b856a70 
…try>

Apple: Fix direct linking with +verbatim

Linking with `+verbatim` somewhat worked before, but only when the library was included as part of an rlib.

Fixes rust-lang#132264.

CC `@petrochenkov,` since you've worked on `+verbatim` before.

`@rustbot` label O-apple A-linkage

try-job: aarch64-apple
try-job: x86_64-apple-2
@bors
Copy link
Contributor

bors commented Oct 31, 2024

⌛ Trying commit 71a8af9 with merge b856a70...

@bors
Copy link
Contributor

bors commented Oct 31, 2024

☀️ Try build successful - checks-actions
Build commit: b856a70 (b856a702839228028a62e27c73436bf9ff590a4e)

@jieyouxu
Copy link
Member

Try job passed, feel free to r=me if petrochenkov has no further concerns.

@petrochenkov
Copy link
Contributor

Please, don't merge this yet, I'll look.

@petrochenkov petrochenkov removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Nov 1, 2024
@petrochenkov petrochenkov added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 1, 2024
@petrochenkov
Copy link
Contributor

I'm tentatively against doing this, otherwise I'd merge this quickly.
I still need to write an explanation though, sorry for the delays.

@madsmtm
Copy link
Contributor Author

madsmtm commented Nov 9, 2024

sorry for the delays.

There's no haste from my side, I don't need this myself.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@petrochenkov petrochenkov

Labels
A-linkage Area: linking into static, shared libraries and binaries A-run-make Area: port run-make Makefiles to rmake.rs O-apple Operating system: Apple (macOS, iOS, tvOS, visionOS, watchOS) 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Fails to link verbatim libary in 1.82 on macOS
6 participants
@madsmtm @rustbot @jieyouxu @bors @rust-log-analyzer @petrochenkov