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

Reduce default configuration's dependency upon static libstdcpp library (#103606) #104245

Closed
wants to merge 2 commits into from
Closed

Reduce default configuration's dependency upon static libstdcpp library (#103606) #104245

wants to merge 2 commits into from

Conversation

kubycsolutions
Copy link

@kubycsolutions kubycsolutions commented Nov 10, 2022 •
edited by jyn514
Loading

Fixes #103606

Remove default dependency on static libstdcpp except during dist llvm builds (where we want static libraries so libLLVM.so is self-contained).

@rustbot
Copy link
Collaborator

rustbot commented Nov 10, 2022

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

Please see the contribution instructions for more information.

@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Nov 10, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
jyn514
jyn514 approved these changes Nov 10, 2022
View reviewed changes
Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

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

this looks good! r=me if my fix gets CI to pass :)

config.toml.example Outdated Show resolved Hide resolved
src/ci/run.sh Outdated Show resolved Hide resolved
@jyn514 jyn514 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 Nov 10, 2022
@jyn514
Copy link
Member

jyn514 commented Nov 10, 2022

looks like it got past ./configure :) can you squash the commits? https://rustc-dev-guide.rust-lang.org/git.html#advanced-rebasing
r=me with that done

@the8472
Copy link
Member

the8472 commented Nov 10, 2022

The PR title could be better, I think that ends up in the git history.

@kubycsolutions kubycsolutions changed the title Alternative fix, hopefully simpler. Reduce default configuration's dependency upon static libstdcpp library (#103606) Nov 10, 2022
@kubycsolutions
Copy link
Author

PR title/description improved; thanks for catching that.

@jyn514
Copy link
Member

jyn514 commented Nov 10, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Nov 10, 2022

📌 Commit 84585b466a14d5f1cca889f105a08186b9083818 has been approved by jyn514

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 10, 2022
@fbstj
Copy link
Contributor

fbstj commented Nov 10, 2022

this still needs squashing?

@kubycsolutions
Copy link
Author

When I now try to run "git rebase --interactive master", the control file comes up with "noop" where I would expect to see a list of commits. But I'm still seeing 6 commits at the top of this page. So I'm not sure what my current state is...

(This is one reason my group was using the "squash as you merge" option -- it does seem to offer fewer opportunities for error.)

@kubycsolutions
Avoid runtime dependency on static libstdc++
b8edf02 
Usually, we do want to use the static C++ library when building rustc_llvm, but do not want to have that dependency at compiler runtime. Change the defaults to Make It So.
@kubycsolutions
Copy link
Author

Should now be squashed.

@jyn514
Copy link
Member

jyn514 commented Nov 11, 2022

@bors r- r+

@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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 11, 2022
@bors
Copy link
Contributor

bors commented Nov 11, 2022

📌 Commit b8edf02 has been approved by jyn514

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 11, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Nov 11, 2022
@Dylan-DPC
Rollup merge of rust-lang#104245 - kubycsolutions:master, r=jyn514
3781120 
Reduce default configuration's dependency upon static libstdcpp library (rust-lang#103606)

Fixes rust-lang#103606

Remove default dependency on static libstdcpp except during dist llvm builds (where we want static libraries so `libLLVM.so` is self-contained).
@Dylan-DPC Dylan-DPC mentioned this pull request Nov 11, 2022
Merged
@jyn514
Copy link
Member

jyn514 commented Nov 11, 2022

@kubycsolutions you don't need to make any further changes to this PR, it's already been approved :)

@kubycsolutions
Copy link
Author

There had been grumbles about it not being Squashed, and I was having a bit of trouble remembering the syntax for that.... Should be done with it now,

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 11, 2022
@bors
Auto merge of rust-lang#104289 - Dylan-DPC:rollup-v7wei2t, r=Dylan-DPC
7d85104 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#100633 (Consider `#[must_use]` annotation on `async fn` as also affecting the `Future::Output`)
 - rust-lang#103445 (`#[test]`: Point at return type if `Termination` bound is unsatisfied)
 - rust-lang#103924 (Fix broken link in description of error code E0706)
 - rust-lang#104146 (Retry binding TCP Socket in remote-test-server)
 - rust-lang#104169 (Migrate `:target` rules to use CSS variables)
 - rust-lang#104202 (Fix ICE rust-lang#103748)
 - rust-lang#104216 (Don't ICE on operator trait methods with generic methods)
 - rust-lang#104217 (Display help message when fluent arg was referenced incorrectly)
 - rust-lang#104245 (Reduce default configuration's dependency upon static libstdcpp library (rust-lang#103606))

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@jyn514
Copy link
Member

jyn514 commented Nov 11, 2022

Merged in #104289

@jyn514 jyn514 closed this Nov 11, 2022
@RalfJung RalfJung mentioned this pull request Nov 13, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jyn514 jyn514 jyn514 approved these changes

Assignees

@jyn514 jyn514

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure 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.

Compiler build depends on libstdc++-static
7 participants
@kubycsolutions @rustbot @rust-log-analyzer @jyn514 @the8472 @bors @fbstj