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.

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

Add rustc_codegen_ssa to sysroot #56048

Merged
merged 2 commits into from
Nov 23, 2018
Merged

Add rustc_codegen_ssa to sysroot #56048

merged 2 commits into from
Nov 23, 2018

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Nov 18, 2018

Outside of rustc you are currently unable to use it.

r? @nikomatsakis (because you r+'ed #55627)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 18, 2018
@eddyb
Copy link
Member

eddyb commented Nov 18, 2018

Please cc me on PRs related to rustc_codegen_ssa.


I did this on purpose. It allows only codegen backends to be recompiled, without impacting the driver.

I think we need better rustbuild integration to ship dylibs or rlibs for rustc_codegen_ssa. Or we can accept this PR as-is, but we should at least discuss it a bit.

cc @rust-lang/compiler @Mark-Simulacrum @alexcrichton

@eddyb eddyb added I-nominated T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Nov 18, 2018
@Mark-Simulacrum
Copy link
Member

It shouldn't be too hard to wire up rustbuild to copy the ssa dylib into the sysroot; I agree that such a change would be preferable here. I can probably get some instructions up if that would be helpful, @bjorn3 - loosely I'd start looking in src/bootstrap/compiler.rs.

@alexcrichton
Copy link
Member

I don't personally have an opinion on whether or not this should go in the sysroot. If it should then this PR looks best to me.

@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Nov 19, 2018

Actually, looking at this a bit more, I think I misunderstood the specific intent here, and now agree that this PR makes more sense than rustbuild modifications as a solution to this problem.

We can maybe move the specific dependency edge to src/rustc to avoid rebuilding driver (or shift rustbuild around to use some other "fake" root crate).

@bjorn3
Copy link
Member Author

bjorn3 commented Nov 19, 2018

Please cc me on PRs related to rustc_codegen_ssa.

Will do it next time.


We can maybe move the specific dependency edge to src/rustc to avoid rebuilding driver (or shift rustbuild around to use some other "fake" root crate).

Done

@Mark-Simulacrum
Copy link
Member

@eddyb I think the latest changes should essentially resolve your concerns with regards to compile times; as such I'm r=me on this change since I think it does the sort of "minimal" changeset to make this happen.

@nikomatsakis
Copy link
Contributor

@bors r+

@eddyb gave their assent here

@bors
Copy link
Contributor

bors commented Nov 20, 2018

📌 Commit 040ffba76bf8cd02e8fa5b40af872d52ae54c30a has been approved by nikomatsakis

@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 Nov 20, 2018
@bors
Copy link
Contributor

bors commented Nov 22, 2018

☔ The latest upstream changes (presumably #53586) made this pull request unmergeable. Please resolve the merge conflicts.

@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 22, 2018
@bjorn3
Copy link
Member Author

bjorn3 commented Nov 22, 2018

Rebased

@eddyb
Copy link
Member

eddyb commented Nov 22, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Nov 22, 2018

📌 Commit 60e4158 has been approved by eddyb

@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 22, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Nov 23, 2018
Add rustc_codegen_ssa to sysroot

Outside of rustc you are currently unable to use it.

r? @nikomatsakis (because you r+'ed rust-lang#55627)
bors added a commit that referenced this pull request Nov 23, 2018
Rollup of 14 pull requests

Successful merges:

 - #55767 (Disable some pretty-printers when gdb is rust-enabled)
 - #55838 (Fix #[cfg] for step impl on ranges)
 - #55869 (Add std::iter::unfold)
 - #55945 (Ensure that the argument to `static_assert` is a `bool`)
 - #56022 (When popping in CTFE, perform validation before jumping to next statement to have a better span for the error)
 - #56048 (Add rustc_codegen_ssa to sysroot)
 - #56091 (Fix json output in the self-profiler)
 - #56097 (Fix invalid bitcast taking bool out of a union represented as a scalar)
 - #56116 (ci: Download clang/lldb from tarballs)
 - #56120 (Add unstable Literal::subspan().)
 - #56154 (Pass additional linker flags when targeting Fuchsia)
 - #56162 (std::str Adapt documentation to reality)
 - #56163 ([master] Backport 1.30.1 release notes)
 - #56168 (Fix the tracking issue for hash_raw_entry)

Failed merges:

r? @ghost
@bors bors merged commit 60e4158 into rust-lang:master Nov 23, 2018
@bjorn3 bjorn3 deleted the cg_ssa_sysroot branch November 24, 2018 09:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

7 participants