Skip to content

Clone the src/llvm-project submodule if profiling is enabled #99872

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Jul 29, 2022

Conversation

Noratrieb
Copy link
Member

To compile rustc with profiling information, compiler-rt from LLVM is required. Building it requires the src/llvm-project submodule to be initialized and updated.

Fixes #99869

To compile rustc with profiling information, `compiler-rt` from
LLVM is required. Building it requires the `src/llvm-project` submodule
to be initialized and updated.
@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Jul 28, 2022
@rust-highfive
Copy link
Contributor

r? @jyn514

(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 Jul 28, 2022
@jyn514
Copy link
Member

jyn514 commented Jul 28, 2022

👍 this is what I imagined. Have you tested to make sure it works? You can get rid of the submodule with git submodule deinit -f src/llvm-project.

@Noratrieb
Copy link
Member Author

Yes, I have tested it locally. I deinited the submodule, and then built it without profiling info. The submodule did not get cloned. I then enabled profiling, and it got cloned and compiled profiler_builtins correctly (it showed the LLVM warnings).

@jyn514
Copy link
Member

jyn514 commented Jul 28, 2022

@bors r+ rollup (CI doesn't use submodules)

@bors
Copy link
Collaborator

bors commented Jul 28, 2022

📌 Commit e1e736b 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 28, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 29, 2022
Rollup of 8 pull requests

Successful merges:

 - rust-lang#99686 (add suggestion when there is a impl of external trait on pointer with wrong coherence rules)
 - rust-lang#99760 (doc/rustc: describe the uefi target platforms)
 - rust-lang#99766 (Htmldocck: Substitute the doc channel when blessing)
 - rust-lang#99781 (Use String::from_utf8_lossy in CStr demo)
 - rust-lang#99803 (Update mentions to `rustc_metadata::rmeta::Lazy`)
 - rust-lang#99845 (Remove `$` prefix for bash scripts in doc)
 - rust-lang#99850 (rustdoc: Remove more Clean trait implementations)
 - rust-lang#99872 (Clone the `src/llvm-project` submodule if profiling is enabled)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a8f77ad into rust-lang:master Jul 29, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jul 29, 2022
@Noratrieb Noratrieb deleted the bootstrap-llvm branch July 29, 2022 12:56
@Noratrieb Noratrieb restored the bootstrap-llvm branch December 3, 2022 19:44
@Noratrieb Noratrieb deleted the bootstrap-llvm branch December 23, 2022 21:00
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
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)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bootstrap doesn't clone llvm-project if profiling is enabled
5 participants