bootstrap: Locate llvm-dwp based on llvm-config bindir#81955
Merged
bors merged 1 commit intorust-lang:masterfrom Feb 12, 2021
Merged
bootstrap: Locate llvm-dwp based on llvm-config bindir#81955bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
Contributor
|
(rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Mark-Simulacrum
added
beta-accepted
Member
|
@bors r+ This looks good, thanks. I've accepted for beta backport so we at least get it into 1.51. @pietroalbini I think we probably have enough time left to rebuild stable as well, would you be up for doing so? |
Collaborator
|
📌 Commit d3fea13 has been approved by |
bors
added
S-waiting-on-bors
Member
|
I can prepare a rebuild, yes! |
Merged
Member
|
Opened #81963 to include this in 1.50.0. |
emilyalbini
removed
the
beta-nominated
Merged
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 10, 2021
…etroalbini Rebuild 1.50.0 stable This PR rebuilds the 1.50.0 stable release with the following backport: * bootstrap: Locate llvm-dwp based on llvm-config bindir rust-lang#81955 cc `@rust-lang/release`
dtolnay
commented
Feb 10, 2021
Member
Author
dtolnay
left a comment
dtolnay
left a comment
There was a problem hiding this comment.
Thank you @pietroalbini! FWIW I don't necessarily feel this has to go into 1.50.0. It was easy enough for me to work around and probably only a small number of places would hit this (only environments with an llvm-config wrapper script separate from the other LLVM bins).
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Feb 11, 2021
bootstrap: Locate llvm-dwp based on llvm-config bindir Fixes rust-lang#81949. Tested by successfully building 1.50.0 pre-release, which is where I originally hit the issue (https://internals.rust-lang.org/t/rust-1-50-0-pre-release-testing/14012/4?u=dtolnay). Tested both with and without prebuilt LLVM. The check for dry_run is necessary in the non-prebuilt case because the llvm-config built by bootstrap won't exist yet.
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Feb 11, 2021
bootstrap: Locate llvm-dwp based on llvm-config bindir Fixes rust-lang#81949. Tested by successfully building 1.50.0 pre-release, which is where I originally hit the issue (https://internals.rust-lang.org/t/rust-1-50-0-pre-release-testing/14012/4?u=dtolnay). Tested both with and without prebuilt LLVM. The check for dry_run is necessary in the non-prebuilt case because the llvm-config built by bootstrap won't exist yet.
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Feb 11, 2021
bootstrap: Locate llvm-dwp based on llvm-config bindir Fixes rust-lang#81949. Tested by successfully building 1.50.0 pre-release, which is where I originally hit the issue (https://internals.rust-lang.org/t/rust-1-50-0-pre-release-testing/14012/4?u=dtolnay). Tested both with and without prebuilt LLVM. The check for dry_run is necessary in the non-prebuilt case because the llvm-config built by bootstrap won't exist yet.
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Feb 12, 2021
bootstrap: Locate llvm-dwp based on llvm-config bindir Fixes rust-lang#81949. Tested by successfully building 1.50.0 pre-release, which is where I originally hit the issue (https://internals.rust-lang.org/t/rust-1-50-0-pre-release-testing/14012/4?u=dtolnay). Tested both with and without prebuilt LLVM. The check for dry_run is necessary in the non-prebuilt case because the llvm-config built by bootstrap won't exist yet.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 12, 2021
Rollup of 16 pull requests Successful merges: - rust-lang#79983 (fix indefinite article in cell.rs) - rust-lang#81831 (Don't display `mut` in arguments for functions documentation) - rust-lang#81947 (Relax ItemCtxt::to_ty lifetime) - rust-lang#81954 (RELEASES.md 1.50: Group platform support notes together) - rust-lang#81955 (bootstrap: Locate llvm-dwp based on llvm-config bindir) - rust-lang#81959 (Fix assosiated typo) - rust-lang#81964 (Fix documentation not showing on localStorage error) - rust-lang#81968 (bootstrap: fix wrong docs installation path) - rust-lang#81990 (Make suggestion of changing mutability of arguments broader) - rust-lang#81994 (Improve long explanation for E0542 and E0546) - rust-lang#81997 (dist: include src/build_helper as part of the crate graph for rustc-dev) - rust-lang#82003 (Stack probes: fix error message) - rust-lang#82004 (clean up clean::Static struct) - rust-lang#82011 (Fix private intra-doc warnings on associated items) - rust-lang#82013 (Tell user how to fix CI file being not up to date) - rust-lang#82017 (Fix typo in mod.rs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
dtolnay
added
T-bootstrap
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Fixes #81949.
Tested by successfully building 1.50.0 pre-release, which is where I originally hit the issue (https://internals.rust-lang.org/t/rust-1-50-0-pre-release-testing/14012/4?u=dtolnay). Tested both with and without prebuilt LLVM. The check for dry_run is necessary in the non-prebuilt case because the llvm-config built by bootstrap won't exist yet.