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

Only copy LLVM into rust-dev with internal LLVM #76573

Merged
merged 1 commit into from
Sep 11, 2020

Conversation

Mark-Simulacrum
Copy link
Member

This avoids needing to figure out where to locate each of the components with an
external LLVM. This component isn't manifested for rustup consumption and
generally shouldn't matter for anyone except Rust's CI, so it is fine for it to not be
complete elsewhere.

Fixes #76572.

r? @alexcrichton

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 10, 2020
@semarie
Copy link
Contributor

semarie commented Sep 10, 2020

does it make sens to even build it for external llvm ? the tarball will be almost empty. But maybe it will be extended later ?

LlvmTools uses the following:

        /* run only if llvm-config isn't used */
        if let Some(config) = builder.config.target_config.get(&target) {
            if let Some(ref _s) = config.llvm_config {
                builder.info(&format!("Skipping LlvmTools ({}): external LLVM", target));
                return None;
            }
        }

This avoids needing to figure out where to locate each of the components with an
external LLVM.
@Mark-Simulacrum Mark-Simulacrum force-pushed the bootstrap-with-external-llvm branch from dbaf8e3 to 4f2d941 Compare September 10, 2020 16:05
@Mark-Simulacrum
Copy link
Member Author

Yeah, I am thinking that we'll expand it eventually but for now I think it does indeed make sense to just skip it entirely.

@alexcrichton
Copy link
Member

Hm I don't think I've kept up enough with this over the past, I'm not sure what RustDev is :(. Can you provide a small description of what it's used for?

@Mark-Simulacrum
Copy link
Member Author

It's the component intended for aiding rustc development, specifically providing pre-compiled LLVMs to developers (along with llvm-config and header files, basically enough for librustc_llvm to compile and link to this LLVM). It was just added a few days ago in #76332

@alexcrichton
Copy link
Member

@bors: r+

Ok cool, makes sense to me!

@bors
Copy link
Contributor

bors commented Sep 10, 2020

📌 Commit 4f2d941 has been approved by alexcrichton

@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 Sep 10, 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 Sep 10, 2020
@bors
Copy link
Contributor

bors commented Sep 11, 2020

⌛ Testing commit 4f2d941 with merge d778203...

@bors
Copy link
Contributor

bors commented Sep 11, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: alexcrichton
Pushing d778203 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 11, 2020
@bors bors merged commit d778203 into rust-lang:master Sep 11, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 11, 2020
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.

rust-dev doesn't support building with external llvm
7 participants