Skip to content

Late link args order#77208

Merged
bors merged 1 commit intorust-lang:masterfrom
mati865:late-link-args-order
Sep 27, 2020
Merged

Late link args order#77208
bors merged 1 commit intorust-lang:masterfrom
mati865:late-link-args-order

Conversation

@mati865
Copy link
Member

@mati865 mati865 commented Sep 25, 2020 •
edited
Loading

MSYS2 changed how winpthreads is built and as the result it now depends on more mingw-w64 libraries.

This PR affects only MinGW targets since nobody else is using late_link_args_{dynamic,static}. Now the order is similar to how it used to be before #67502.

@rust-highfive
Copy link
Contributor

rust-highfive commented Sep 25, 2020

r? @kennytm

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 25, 2020
@mati865
Copy link
Member Author

mati865 commented Sep 25, 2020

r? @petrochenkov

@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Sep 25, 2020

@bors try

@bors
Copy link
Collaborator

bors commented Sep 25, 2020

⌛ Trying commit 06dbdf73fa7ead1c92ae8abecb7138d303c41866 with merge dfb2e34adb336d08717f504779beba322b27d7a9...

@bors
Copy link
Collaborator

bors commented Sep 25, 2020

☀️ Try build successful - checks-actions, checks-azure
Build commit: dfb2e34adb336d08717f504779beba322b27d7a9 (dfb2e34adb336d08717f504779beba322b27d7a9)

@petrochenkov
Copy link
Contributor

petrochenkov commented Sep 26, 2020

error: .github/workflows/ci.yml is not up to date
caused by: src/ci/github-actions/ci.yml and .github/workflows/ci.yml are different

@petrochenkov petrochenkov 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 Sep 26, 2020
@mati865 mati865 force-pushed the late-link-args-order branch from 06dbdf7 to bfdb790 Compare September 26, 2020 13:45
@mati865
Copy link
Member Author

mati865 commented Sep 26, 2020

error: .github/workflows/ci.yml is not up to date
caused by: src/ci/github-actions/ci.yml and .github/workflows/ci.yml are different

I was testing it on Windows and expand-yaml-anchors tools bug has slipped in:

-#   src/ci/github-actions/ci.yml
+#   src/ci/github-actions\ci.yml

Tested try build and it seems to fix the issue. It'd be nice if this got backported to the beta.

@rustbot modify labels: -S-waiting-on-author +S-waiting-on-review

@bors rollup=iffy

@bors
Copy link
Collaborator

bors commented Sep 26, 2020

@mati865: 🔑 Insufficient privileges: not in try users

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 26, 2020
@mati865 mati865 marked this pull request as ready for review September 26, 2020 13:54
@petrochenkov
Copy link
Contributor

petrochenkov commented Sep 26, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 26, 2020

📌 Commit bfdb790 has been approved by petrochenkov

@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 Sep 26, 2020
@petrochenkov petrochenkov added beta-nominated Nominated for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 26, 2020
This was referenced Sep 26, 2020
Closed
Closed
Closed
@jonas-schievink jonas-schievink mentioned this pull request Sep 26, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 27, 2020
@bors
Auto merge of rust-lang#77247 - jonas-schievink:rollup-r6ehh8h, r=jon…
1ec980d 
…as-schievink

Rollup of 10 pull requests

Successful merges:

 - rust-lang#76917 (Add missing code examples on HashMap types)
 - rust-lang#77107 (Enable const propagation into operands at mir_opt_level=2)
 - rust-lang#77129 (Update cargo)
 - rust-lang#77167 (Fix FIXME in core::num test: Check sign of zero in min/max tests.)
 - rust-lang#77184 (Rust vec bench import specific rand::RngCore)
 - rust-lang#77208 (Late link args order)
 - rust-lang#77209 (Fix documentation highlighting in ty::BorrowKind)
 - rust-lang#77231 (Move helper function for `missing_const_for_fn` out of rustc to clippy)
 - rust-lang#77235 (pretty-print-reparse hack: Rename some variables for clarity)
 - rust-lang#77243 (Test more attributes in test issue-75930-derive-cfg.rs)

Failed merges:

r? `@ghost`
@bors bors merged commit 3d1d24d into rust-lang:master Sep 27, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 27, 2020
@mati865 mati865 deleted the late-link-args-order branch September 27, 2020 10:57
@mati865 mati865 mentioned this pull request Sep 27, 2020
Closed
@mati865
Copy link
Member Author

mati865 commented Sep 28, 2020

FWIW MSYS2 has partially reverted changes to winpthreads. I believe this PR is still the right way to go (on the master) but we don't need to backport it any more.

@petrochenkov petrochenkov removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 28, 2020
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

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

Milestone

1.48.0

Development

Successfully merging this pull request may close these issues.

7 participants

@mati865 @rust-highfive @Mark-Simulacrum @bors @petrochenkov @kennytm @rustbot