Skip to content

Ignore proc-macros when assembling rustc libdir #80315

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

Merged
merged 1 commit into from
Dec 27, 2020

Conversation

tmiasko
Copy link
Contributor

@tmiasko tmiasko commented Dec 23, 2020

Fixes #80294.

@rust-highfive
Copy link
Contributor

r? @Mark-Simulacrum

(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 23, 2020
@jyn514 jyn514 added 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. labels Dec 23, 2020
@Mark-Simulacrum
Copy link
Member

I just re-read the explanation of dual proc macros - https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/-Z.20dual-proc-macros.

cc @petrochenkov

I think this should be fine, presuming my model that $sysroot/lib/ exists only for runtime linkage of rustc (and tool) binaries is accurate. The proc macro libraries dropped by this PR are currently still needed in the $sysroot/lib/rustlib/$host/lib and $sysroot/lib/rustlib/$target/lib when cross-compiling plugins/drivers from $host to $target, but $sysroot/lib should not be in the compiler's search path at that time I believe (but am somewhat unsure). AFAICT, this PR should not change the contents of the rustlib directory.

@petrochenkov
Copy link
Contributor

I more or less remember why -Zdual-proc-macros are necessary, but have very little idea of how they maps on files and directories in Rust distribution, and which of those files are affected by this patch.

If both proc-macros-for-target and proc-macros-for-host were previously shipped together with other-artifacts-for-target, and now only proc-macros-for-target are shipped, then it should be ok.

@petrochenkov
Copy link
Contributor

In any case, this can be reverted later if something breaks.

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Dec 27, 2020

📌 Commit 3271681 has been approved by Mark-Simulacrum

@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 27, 2020
@bors
Copy link
Collaborator

bors commented Dec 27, 2020

⌛ Testing commit 3271681 with merge 76188b6...

@bors
Copy link
Collaborator

bors commented Dec 27, 2020

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 76188b6 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 27, 2020
@bors bors merged commit 76188b6 into rust-lang:master Dec 27, 2020
@rustbot rustbot added this to the 1.51.0 milestone Dec 27, 2020
@tmiasko tmiasko deleted the ignore-proc-macros branch December 28, 2020 11:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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
Development

Successfully merging this pull request may close these issues.

rustc is distributed with unnecessary? procedural macros ~60 MB
7 participants