Skip to content

Install CI llvm into the library directory #79074

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

Jump to bottom
Merged
merged 1 commit into from
Nov 16, 2020
Merged

Install CI llvm into the library directory #79074

merged 1 commit into from
Nov 16, 2020

Conversation

Mark-Simulacrum
Copy link
Member

In other words, my concern in #78932 (comment) was perfectly justified by something we were already doing. For now just special case CI LLVM, but in the future we may want a more general fix.

Fixes #79071.

r? @alexcrichton

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 15, 2020
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Nov 15, 2020
Closed
@jyn514 jyn514 added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Nov 15, 2020
@jyn514
Copy link
Member

jyn514 commented Nov 15, 2020

For now just special case CI LLVM, but in the future we may want a more general fix.

What do you mean by a more general fix? We only don't install LLVM if someone explicitly sets llvm-config in config.toml, right? I think setting both llvm-config and download-ci-llvm is a user error and should be reported as an error.

@jyn514
Copy link
Member

jyn514 commented Nov 15, 2020 •
edited
Loading

just double checking: @est31 do you have llvm-config set in config.toml?

@Mark-Simulacrum
Copy link
Member Author

The LLVM from CI option automatically configures llvm-config to point at the CI built LLVM (downloaded for you).

@jyn514
Copy link
Member

jyn514 commented Nov 15, 2020

Ah ok, that makes sense. It sounds like setting both is being silently overridden right now, which maybe isn't a big deal.

@Mark-Simulacrum
Copy link
Member Author

No, it should error out if config.toml specifies an llvm config but llvm-from-ci is set.

@Mark-Simulacrum Mark-Simulacrum added beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Nov 15, 2020
@Mark-Simulacrum
Copy link
Member Author

Going to approve this for beta because the patch it fixes up (#78986) is also going to get a beta backport. Likely doesn't really matter too much since no one really develops on the beta branch but will be helpful for me when I'm doing backports.

@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Nov 15, 2020
Merged
@Mark-Simulacrum
Copy link
Member Author

Despite inclusion in #79075, leaving this beta-accepted/beta-nominated because it should go into 1.49 as well.

@jyn514
Copy link
Member

jyn514 commented Nov 15, 2020

@bors r+ p=1

This fixes a bug that breaks download-ci-llvm, causing contributors to get strange build errors.

@bors
Copy link
Collaborator

bors commented Nov 15, 2020

📌 Commit 4feaa35 has been approved by jyn514

@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 Nov 15, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 15, 2020
@bors
Auto merge of rust-lang#79075 - Mark-Simulacrum:beta-next, r=Mark-Sim…
8236dc0 
…ulacrum

[beta] next

This backports:

* Avoid installing external LLVM dylibs rust-lang#78986
* Install CI llvm into the library directory rust-lang#79074
* Revert "Revert "resolve: Avoid "self-confirming" import resolutions in one more case"" rust-lang#78784
* Bump Rustfmt and RLS rust-lang#78775
* Enforce no-move rule of ReentrantMutex using Pin and fix UB in stdio rust-lang#77801

For RLS/rustfmt compilation to succeed:
* change the order of type arguments on ControlFlow rust-lang#76614
* Add ControlFlow::is_{break,continue} methods rust-lang#78200
* Replace run_compiler with RunCompiler builder pattern rust-lang#77649

As a dependency of rust-lang#77801:
*  Add Pin::static_ref, static_mut. rust-lang#77726
@bors
Copy link
Collaborator

bors commented Nov 16, 2020

⌛ Testing commit 4feaa35 with merge f4d014c...

@bors
Copy link
Collaborator

bors commented Nov 16, 2020

☀️ Test successful - checks-actions
Approved by: jyn514
Pushing f4d014c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 16, 2020
@bors bors merged commit f4d014c into rust-lang:master Nov 16, 2020
@rustbot rustbot added this to the 1.50.0 milestone Nov 16, 2020
@pietroalbini pietroalbini added beta-nominated Nominated for backporting to the compiler in the beta channel. and removed beta-nominated Nominated for backporting to the compiler in the beta channel. labels Nov 16, 2020
@pietroalbini pietroalbini mentioned this pull request Nov 17, 2020
Merged
@pietroalbini pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 17, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 18, 2020
@bors
Auto merge of rust-lang#79132 - pietroalbini:beta-next, r=Mark-Simula…
87776d7 
…crum

Prepare beta 1.49.0

This PR sets everything up for beta 1.49.0, and backports the following PRs to it:

* rust-lang#79107 - build-manifest: strip newline from rustc version
* rust-lang#78986 - Avoid installing external LLVM dylibs
* rust-lang#79074 - Install CI llvm into the library directory
* rust-lang#78364 - Update RELEASES.md for 1.48.0
* rust-lang#77939 - Ensure that the source code display is working with DOS backline

r? `@ghost`
cc `@rust-lang/release`
@pietroalbini pietroalbini mentioned this pull request Nov 18, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 18, 2020
@bors
Auto merge of rust-lang#79162 - pietroalbini:beta-next, r=pietroalbini
21dea46 
Actually prepare beta 1.49.0

This PR sets everything up for beta 1.49.0, and backports the following PRs to it:

* rust-lang#79107 - build-manifest: strip newline from rustc version
* rust-lang#78986 - Avoid installing external LLVM dylibs
* rust-lang#79074 - Install CI llvm into the library directory
* rust-lang#78364 - Update RELEASES.md for 1.48.0
* rust-lang#77939 - Ensure that the source code display is working with DOS backline

This is the same as rust-lang#79132, but actually targeting the right branch.

r? `@ghost`
cc `@rust-lang/release`
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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)
Projects
None yet
Milestone
1.50.0
Development

Successfully merging this pull request may close these issues.

Can't use download-ci-llvm any more
7 participants
@Mark-Simulacrum @jyn514 @bors @alexcrichton @pietroalbini @rust-highfive @rustbot