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

Ignore -Zprofile when building compiler_builtins #71364

Merged
merged 1 commit into from
Apr 25, 2020

Conversation

Amanieu
Copy link
Member

@Amanieu Amanieu commented Apr 20, 2020

#70846 made the compiler_builtins crate ignore the default codegen-units setting and instead always split each function into a different codegen unit.

This unfortunately breaks -Zprofile which requires a single codegen unit per crate (see #71283). You can notice this when building with cargo -Zbuild-std and RUSTFLAGS containing -Zprofile.

This PR works around this issue by just ignoring -Zprofile for the compiler-builtins crate.

@rust-highfive
Copy link
Collaborator

r? @cramertj

(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 Apr 20, 2020
@cramertj
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Apr 22, 2020

📌 Commit 3eb1c43 has been approved by cramertj

@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 Apr 22, 2020
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Apr 23, 2020
… r=cramertj

Ignore -Zprofile when building compiler_builtins

rust-lang#70846 made the `compiler_builtins` crate ignore the default codegen-units setting and instead always split each function into a different codegen unit.

This unfortunately breaks `-Zprofile` which requires a single codegen unit per crate (see rust-lang#71283). You can notice this when building with `cargo -Zbuild-std` and `RUSTFLAGS` containing `-Zprofile`.

This PR works around this issue by just ignoring `-Zprofile` for the `compiler-builtins` crate.
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 25, 2020
Rollup of 5 pull requests

Successful merges:

 - rust-lang#71364 (Ignore -Zprofile when building compiler_builtins)
 - rust-lang#71494 (Fix span of while (let) expressions after lowering)
 - rust-lang#71517 ( Quick and dirty fix of the unused_braces lint)
 - rust-lang#71523 (Take a single root node in range_search)
 - rust-lang#71533 (Revert PR 70566 for const validation fix)

Failed merges:

r? @ghost
@bors bors merged commit cbbf065 into rust-lang:master Apr 25, 2020
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants