Skip to content
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

Jump to bottom

Reenable static linking of libstdc++ on windows-gnu #67410

Merged
merged 1 commit into from
Dec 22, 2019
Merged

Reenable static linking of libstdc++ on windows-gnu #67410

merged 1 commit into from
Dec 22, 2019

Conversation

mati865
Copy link
Contributor

@mati865 mati865 commented Dec 18, 2019

Fixes #67408

Verified locally that rustc_driver is now statically linked to libstdc++.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(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 Dec 18, 2019
@mati865
Copy link
Contributor Author

mati865 commented Dec 18, 2019

Beta nominating and pinging release team leader (cannot ping whole team).

cc @Mark-Simulacrum

@rustbot modify labels: +beta-nominated

@rustbot
Copy link
Collaborator

rustbot commented Dec 18, 2019

Error: Label beta-nominated can only be set by Rust team members

Please let @rust-lang/release know if you're having trouble with this bot.

@Mark-Simulacrum
Copy link
Member

I think this change originally happened in 7f23e6e by @alexcrichton but it looks reasonable based on the comment to only filter out msvc here, so I'm going to go ahead and @bors r+ this PR.

I've also beta-nominated and am going to unilaterally beta-accept myself as a bootstrap change (I think it's pretty clear that it fixes a regression and is a minimal change to do so).

If folks want to raise dissent with that decision please do so, though! It's unlikely we'll have beta backports going in for a week or two in any case.

@bors
Copy link
Contributor

bors commented Dec 18, 2019

📌 Commit 44603a5 has been approved by Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Dec 18, 2019

🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened

@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 18, 2019
@Mark-Simulacrum Mark-Simulacrum added beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Dec 18, 2019
@mati865
Copy link
Contributor Author

mati865 commented Dec 18, 2019 •
edited
Loading

Just to give context here. Without this change tier 1 windows-gnu beta and nightly builds are completely broken unless user has libstdc++-6.dll in their PATH.

@alexcrichton
Copy link
Member

Er apologies for this!

I don't really know why I switched the msvc to windows, it was likely a copy/paste error or a "search and replace" gone wrong, this looks correct to me.

@mati865
Copy link
Contributor Author

mati865 commented Dec 18, 2019 •
edited
Loading

#65703 predates #65911 so it's just a rebase error.

Centril added a commit to Centril/rust that referenced this pull request Dec 20, 2019
@Centril
Rollup merge of rust-lang#67410 - mati865:mingw_link_fix, r=Mark-Simu…
8f5e3d7 
…lacrum

Reenable static linking of libstdc++ on windows-gnu

Fixes rust-lang#67408

Verified locally that `rustc_driver` is now statically linked to libstdc++.
@Centril Centril mentioned this pull request Dec 20, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Dec 22, 2019
@Centril
Rollup merge of rust-lang#67410 - mati865:mingw_link_fix, r=Mark-Simu…
a698791 
…lacrum

Reenable static linking of libstdc++ on windows-gnu

Fixes rust-lang#67408

Verified locally that `rustc_driver` is now statically linked to libstdc++.
@Centril Centril mentioned this pull request Dec 22, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Dec 22, 2019
@Centril
Rollup merge of rust-lang#67410 - mati865:mingw_link_fix, r=Mark-Simu…
35ff2f1 
…lacrum

Reenable static linking of libstdc++ on windows-gnu

Fixes rust-lang#67408

Verified locally that `rustc_driver` is now statically linked to libstdc++.
@Centril Centril mentioned this pull request Dec 22, 2019
Merged
bors added a commit that referenced this pull request Dec 22, 2019
@bors
Auto merge of #67505 - Centril:rollup-7win7ty, r=Centril
3982d35 
Rollup of 6 pull requests

Successful merges:

 - #67148 ( Refactor type & bounds parsing thoroughly)
 - #67410 (Reenable static linking of libstdc++ on windows-gnu)
 - #67439 (Cleanup `lower_pattern_unadjusted` & Improve slice pat typeck)
 - #67480 (Require issue = "none" over issue = "0" in unstable attributes)
 - #67500 (Tweak non_shorthand_field_patterns' suggestion)
 - #67504 (Warn against relying on ?Sized being last)

Failed merges:

r? @ghost
@bors bors merged commit 44603a5 into rust-lang:master Dec 22, 2019
@mati865 mati865 deleted the mingw_link_fix branch December 22, 2019 12:04
@jonas-schievink jonas-schievink mentioned this pull request Jan 13, 2020
Merged
bors added a commit that referenced this pull request Jan 14, 2020
@bors
Auto merge of #68189 - jonas-schievink:beta-next, r=Mark-Simulacrum
965ce16 
[Beta] Backports

I did not include #67134 and #67289 since they seem to be on beta already.

* Fix up Command Debug output when arg0 is specified. #67219
* Do not ICE on unnamed future #67289
* Don't suppress move errors for union fields #67314
* Reenable static linking of libstdc++ on windows-gnu #67410
* Use the correct type for static qualifs #67621
* Treat extern statics just like statics in the "const pointer to static" representation #67630
* Do not ICE on lifetime error involving closures #67687
@jonas-schievink jonas-schievink removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 17, 2020
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

missing libstdc++-6.dll in beta-x86_64-pc-windows-gnu (1.41.0-beta.1)
8 participants
@mati865 @rust-highfive @rustbot @Mark-Simulacrum @bors @alexcrichton @nikomatsakis @jonas-schievink