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

Add cargo:rustc-cdylib-link-arg into RESERVED_PREFIXES list #13212

Merged
merged 1 commit into from
Dec 29, 2023
Merged

Add cargo:rustc-cdylib-link-arg into RESERVED_PREFIXES list #13212

merged 1 commit into from
Dec 29, 2023

Conversation

Brooooooklyn
Copy link
Contributor

After #12201 was merged, the cargo:rustc-cdylib-link-arg in build script no longer works

println!("cargo:rustc-cdylib-link-arg=-Wl");
println!("cargo:rustc-cdylib-link-arg=-undefined");
println!("cargo:rustc-cdylib-link-arg=dynamic_lookup");

@rustbot
Copy link
Collaborator

rustbot commented Dec 28, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @epage (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot rustbot added A-build-scripts Area: build.rs scripts S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 28, 2023
Rustin170506
Rustin170506 approved these changes Dec 29, 2023
View reviewed changes
Copy link
Member

@Rustin170506 Rustin170506 left a comment

Choose a reason for hiding this comment

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

Looks good to me. Thanks! 👍

I apologize for overlooking this.

@epage
Copy link
Contributor

epage commented Dec 29, 2023

Did another spot check to make sure nothing was missing. I was specifically looking for rustc-cdylib-link-arg and I still missed it. I'm assuming we all overlooked it because it is in an | clause for a match.

Thanks for fixing this!

Looks like the previous PR was merged into 1.77 which is nightly so no beta backport needed.

@bors r+

@bors
Copy link
Contributor

bors commented Dec 29, 2023

📌 Commit 7aaf275 has been approved by epage

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 Dec 29, 2023
@bors
Copy link
Contributor

bors commented Dec 29, 2023

⌛ Testing commit 7aaf275 with merge 312ad26...

@weihanglo
Copy link
Member

@hi-rustin
could you help do a beta backport?

@epage
Copy link
Contributor

epage commented Dec 29, 2023

@weihanglo #12201 is tagged with 1.77 so I assume no beta backport is needed, right?

@bors
Copy link
Contributor

bors commented Dec 29, 2023

☀️ Test successful - checks-actions
Approved by: epage
Pushing 312ad26 to master...

@bors bors merged commit 312ad26 into rust-lang:master Dec 29, 2023
20 checks passed
@weihanglo
Copy link
Member

oh yes, I was wrong. shouldn't have reviewed PR during vacation 😕

@wmmc88
Copy link

wmmc88 commented Dec 30, 2023

Is this change available in latest nightly(rustc 1.77.0-nightly (3cdd004e5 2023-12-29))?

Starting from rustc 1.77.0-nightly (89e2160c4 2023-12-27), we've been getting build breakage because cargo:rustc-cdylib-link-arg=<xyz> directives are not being passed to the linker: https://github.com/microsoft/windows-drivers-rs/actions/runs/7347004365/job/20002707225. Testing on rustc 1.77.0-nightly (3cdd004e5 2023-12-29) shows that this issue is still present.

@weihanglo
Copy link
Member

@wmmc88
usually it's me doing regular submodule updates. I am on vacation now so not able to do that until new year

If people feel urgent, please follow this process, tag me and I can r+ it: https://doc.crates.io/contrib/process/release.html#submodule-updates

@weihanglo weihanglo mentioned this pull request Jan 1, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 1, 2024
@bors
Auto merge of rust-lang#119485 - weihanglo:update-cargo, r=weihanglo
041d664 
Update cargo

7 commits in ac6bbb33293d8d424c17ecdb42af3aac25fb7295..ef94adb92704acf3967be8cf73ac0b01d818c47a
2023-12-26 23:22:08 +0000 to 2023-12-31 02:20:45 +0000
- cleanup: Remove error-format special-case in `cargo fix` (rust-lang/cargo#13224)
- `cargo fix`: always inherit the jobserver (rust-lang/cargo#13225)
- Bump cargo-credential to 0.4.3 (rust-lang/cargo#13221)
- `cargo add` - fix for adding features from repository with multiple packages. (rust-lang/cargo#13213)
- Remove repetitive words (rust-lang/cargo#13216)
- Add cargo:rustc-cdylib-link-arg into RESERVED_PREFIXES list (rust-lang/cargo#13212)
- chore(doc): doc for custom subcommands look up. (rust-lang/cargo#13203)

r? ghost
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 3, 2024
@bors
Auto merge of rust-lang#119485 - weihanglo:update-cargo, r=weihanglo
1a47f5b 
Update cargo

11 commits in ac6bbb33293d8d424c17ecdb42af3aac25fb7295..add15366eaf3f3eb84717d3b8b71902ca36a7c84
2023-12-26 23:22:08 +0000 to 2024-01-02 03:24:42 +0000
- chore(deps): update gix (rust-lang/cargo#13230)
- chore(deps): update alpine docker tag to v3.19 (rust-lang/cargo#13228)
- rustfix: Support inserting new lines. (rust-lang/cargo#13226)
- Fix fix::fix_in_dependency to not rely on rustc (rust-lang/cargo#13220)
- cleanup: Remove error-format special-case in `cargo fix` (rust-lang/cargo#13224)
- `cargo fix`: always inherit the jobserver (rust-lang/cargo#13225)
- Bump cargo-credential to 0.4.3 (rust-lang/cargo#13221)
- `cargo add` - fix for adding features from repository with multiple packages. (rust-lang/cargo#13213)
- Remove repetitive words (rust-lang/cargo#13216)
- Add cargo:rustc-cdylib-link-arg into RESERVED_PREFIXES list (rust-lang/cargo#13212)
- chore(doc): doc for custom subcommands look up. (rust-lang/cargo#13203)
@wmmc88 wmmc88 mentioned this pull request Jan 4, 2024
Merged
@ehuss ehuss added this to the 1.77.0 milestone Mar 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Rustin170506 Rustin170506 Rustin170506 approved these changes

Assignees

@epage epage

Labels
A-build-scripts Area: build.rs scripts S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.77.0
Development

Successfully merging this pull request may close these issues.
8 participants
@Brooooooklyn @rustbot @epage @bors @weihanglo @wmmc88 @Rustin170506 @ehuss