Avoid installing external LLVM dylibs #78986
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If the LLVM was externally provided, then we don't currently copy artifacts into the sysroot. This is not necessarily the right choice (in particular, it will require the LLVM dylib to be in the linker's load path at runtime), but the common use case for external LLVMs is distribution provided LLVMs, and in that case they're usually in the standard search path (e.g., /usr/lib) and copying them here is going to cause problems as we may end up with the wrong files and isn't what distributions want. This behavior may be revisited in the future though.
rust-highfive
added
the
S-waiting-on-review
Mark-Simulacrum
added
the
beta-nominated
|
Also nominating for beta backport since it fixes a beta regression. I'll likely unilaterally approve if this is r+'d. |
|
@bors: r+ |
|
📌 Commit 3747df7 has been approved by |
bors
added
S-waiting-on-bors
Mark-Simulacrum
added
the
beta-accepted
jyn514
added
T-bootstrap
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 15, 2020
Rollup of 15 pull requests Successful merges: - rust-lang#78352 (Do not call `unwrap` with `signatures` option enabled) - rust-lang#78590 (refactor: removing alloc::collections::vec_deque ignore-tidy-filelength) - rust-lang#78848 (Bump minimal supported LLVM version to 9) - rust-lang#78856 (Explicitly checking for or-pattern before test) - rust-lang#78948 (test: add `()=()=()=...` to weird-exprs.rs) - rust-lang#78962 (Add a test for r# identifiers) - rust-lang#78963 (Added some unit tests as requested) - rust-lang#78966 (Never inline C variadics, cold functions, functions with incompatible attributes ...) - rust-lang#78968 (Include llvm-as in llvm-tools-preview component) - rust-lang#78969 (Normalize function type during validation) - rust-lang#78980 (Fix rustc_ast_pretty print_qpath resulting in invalid macro input) - rust-lang#78986 (Avoid installing external LLVM dylibs) - rust-lang#78988 (Fix an intrinsic invocation on threaded wasm) - rust-lang#78993 (rustc_target: Fix dash vs underscore mismatches in option names) - rust-lang#79013 (Clean up outdated `use_once_payload` pretty printer comment) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This was referenced Nov 15, 2020
Merged
|
Despite inclusion in #79075, leaving this beta-accepted/beta-nominated because it should go into 1.49 as well. |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 15, 2020
…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
Merged
pietroalbini
removed
the
beta-nominated
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 18, 2020
…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`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 18, 2020
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`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If the LLVM was externally provided, then we don't currently copy artifacts into
the sysroot. This is not necessarily the right choice (in particular, it will
require the LLVM dylib to be in the linker's load path at runtime), but the
common use case for external LLVMs is distribution provided LLVMs, and in that
case they're usually in the standard search path (e.g., /usr/lib) and copying
them here is going to cause problems as we may end up with the wrong files and
isn't what distributions want.
This behavior may be revisited in the future though.
Fixes #78932.