Require LLVM_CONFIG to be set in rustc_llvm/build.rs #123294
Merged
+2
−20
Conversation
This file contains hidden or 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
This environment variable should always be set by bootstrap in `rustc_llvm_env`. The fallback is quite ugly and complicated, so removing it is nice.
rustbot
added
S-waiting-on-review
That function is not called in check mode, but this build scripts also quits early in that case.
i.e. 4da4970, and I think this is what that was mimicking: Line 301 in 4da4970 ... but the fallback probably hasn't been functional in a long time. |
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 6, 2024
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#123294 (Require LLVM_CONFIG to be set in rustc_llvm/build.rs) - rust-lang#123467 (MSVC targets should use COFF as their archive format) - rust-lang#123498 (explaining `DefKind::Field`) - rust-lang#123519 (Improve cfg and check-cfg configuration) - rust-lang#123525 (CFI: Don't rewrite ty::Dynamic directly) - rust-lang#123526 (Do not ICE when calling incorrectly defined `transmute` intrinsic) - rust-lang#123528 (Hide async_gen_internals from standard library documentation) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 6, 2024
Rollup merge of rust-lang#123294 - Nilstrieb:reuqire-llvm-config, r=clubby789 Require LLVM_CONFIG to be set in rustc_llvm/build.rs This environment variable should always be set by bootstrap in `rustc_llvm_env`. The fallback is quite ugly and complicated, so removing it is nice. https://github.com/rust-lang/rust/blob/bf71daedc29e7a240261acd1516378047e311a6f/src/bootstrap/src/core/build_steps/compile.rs#L1166 I tried finding when this was added in git history, but it pointed all the way to "add build scripts" at which point I stopped digging more. This has always been here. cc `@nikic` `@cuviper` in case you happen to be aware of a deeper reason behind this r? bootstrap
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.
This environment variable should always be set by bootstrap in
rustc_llvm_env. The fallback is quite ugly and complicated, so removing it is nice.rust/src/bootstrap/src/core/build_steps/compile.rs
Line 1166 in bf71dae
I tried finding when this was added in git history, but it pointed all the way to "add build scripts" at which point I stopped digging more. This has always been here.
cc @nikic @cuviper in case you happen to be aware of a deeper reason behind this
r? bootstrap