Skip to content

Add rustc_codegen_ssa to sysroot - #56048

Merged
bors merged 2 commits into
rust-lang:masterfrom
bjorn3:cg_ssa_sysroot
Nov 23, 2018
Merged

Add rustc_codegen_ssa to sysroot#56048
bors merged 2 commits into
rust-lang:masterfrom
bjorn3:cg_ssa_sysroot

Conversation

@bjorn3

@bjorn3bjorn3 commented Nov 18, 2018

Copy link
Copy Markdown
Member

Outside of rustc you are currently unable to use it.

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

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

eddyb commented Nov 18, 2018

Copy link
Copy Markdown
Contributor

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

@eddybeddyb 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

Mark-Simulacrum commented Nov 18, 2018

Copy link
Copy Markdown
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

alexcrichton commented Nov 19, 2018

Copy link
Copy Markdown
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

Mark-Simulacrum commented Nov 19, 2018•
edited
Loading

Copy link
Copy Markdown
Member

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

bjorn3 commented Nov 19, 2018•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

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

@bjorn3bjorn3 mentioned this pull request Nov 19, 2018
Open
@Mark-Simulacrum

Mark-Simulacrum commented Nov 19, 2018

Copy link
Copy Markdown
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

nikomatsakis commented Nov 20, 2018

Copy link
Copy Markdown
Contributor

@bors r+

@eddyb gave their assent here

@bors

bors commented Nov 20, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 040ffba76bf8cd02e8fa5b40af872d52ae54c30a has been approved by nikomatsakis

@borsbors 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
@bjorn3bjorn3 mentioned this pull request Nov 21, 2018
Closed
@bors

bors commented Nov 22, 2018

Copy link
Copy Markdown
Collaborator

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

@borsbors 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

bjorn3 commented Nov 22, 2018

Copy link
Copy Markdown
MemberAuthor

Rebased

@eddyb

eddyb commented Nov 22, 2018

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Nov 22, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 60e4158 has been approved by eddyb

@borsbors 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
@kennytm
Rollup merge ofrust-lang#56048- bjorn3:cg_ssa_sysroot, r=eddyb
1b707f7
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)
@kennytmkennytm mentioned this pull request Nov 23, 2018
Merged
bors added a commit that referenced this pull request Nov 23, 2018
@bors
Auto merge of#56186- kennytm:rollup, r=kennytm
1f57e48
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:masterNov 23, 2018
@bjorn3
bjorn3 deleted the cg_ssa_sysroot branch November 24, 2018 09:15
@bjorn3bjorn3 mentioned this pull request Nov 24, 2018
Closed
@bjorn3bjorn3 mentioned this pull request Dec 8, 2018
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@nikomatsakisnikomatsakis

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler 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.

7 participants

@bjorn3@eddyb@Mark-Simulacrum@alexcrichton@nikomatsakis@bors@rust-highfive