Skip to content

[bootstrap] Grab the right FileCheck binary for dist when cross-compiling. #95963

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

Merged
merged 1 commit into from
Apr 12, 2022

Conversation

luqmana
Copy link
Member

@luqmana luqmana commented Apr 12, 2022

Fixes #95862

We were using the target dir for all the other LLVM tools (llvm-config, llvm-ar, etc) but the build target dir for FileCheck. This meant for targets which are cross-compiled, we were copying the wrong binary.

@rust-highfive
Copy link
Contributor

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 Apr 12, 2022
@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 12, 2022

📌 Commit 03bcbbf 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 Apr 12, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 12, 2022
Rollup of 4 pull requests

Successful merges:

 - rust-lang#95783 (rustdoc doctest: include signal number in exit status)
 - rust-lang#95794 (`parse_tt`: a few more tweaks)
 - rust-lang#95963 ([bootstrap] Grab the right FileCheck binary for dist when cross-compiling.)
 - rust-lang#95975 (Don't test -Cdefault-linker-libraries=yes when cross compiling.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 911da62 into rust-lang:master Apr 12, 2022
@rustbot rustbot added this to the 1.62.0 milestone Apr 12, 2022
@luqmana luqmana deleted the llvm-dist-cross-filecheck branch April 12, 2022 22:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
5 participants