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

bootstrap: Locate llvm-dwp based on llvm-config bindir #81955

Merged
merged 1 commit into from
Feb 12, 2021

Conversation

dtolnay
Copy link
Member

@dtolnay dtolnay commented Feb 10, 2021

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.

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 10, 2021
@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 Feb 10, 2021
@Mark-Simulacrum
Copy link
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?

@bors
Copy link
Contributor

bors commented Feb 10, 2021

📌 Commit d3fea13 has been approved by Mark-Simulacrum

@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 Feb 10, 2021
@pietroalbini
Copy link
Member

I can prepare a rebuild, yes!

@pietroalbini
Copy link
Member

Opened #81963 to include this in 1.50.0.

@pietroalbini pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 10, 2021
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`
Copy link
Member Author

@dtolnay dtolnay left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
@bors bors merged commit 67403da into rust-lang:master Feb 12, 2021
@rustbot rustbot added this to the 1.52.0 milestone Feb 12, 2021
@dtolnay dtolnay deleted the dwp branch February 26, 2021 06:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bootstrap assumes llvm-dwp is sibling of llvm-config instead of inside bindir
6 participants