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

Retrieve LLVM version from llvm-filecheck binary if it is not set yet #103203

Merged
merged 1 commit into from
Oct 19, 2022

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Oct 18, 2022

In rustc_codegen_gcc, we run the ASM test suite. The problem is that, if a too recent version of the llvm-filecheck binary is provided, an extra argument needs to be passed and the to detect this version, it currently only expects a --llvm-version argument. With this, the version can be determined directly from the llvm-filecheck binary.

r? @Amanieu

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 18, 2022
@GuillaumeGomez GuillaumeGomez changed the title Remove broken condition and pass --allow-unused-prefixes all the time Retrieve LLVM version from llvm-filecheck binary if it is not set yet Oct 18, 2022
@Amanieu
Copy link
Member

Amanieu commented Oct 18, 2022

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Oct 18, 2022

📌 Commit d5fd1af has been approved by Amanieu

It is now in the queue for this repository.

@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 Oct 18, 2022
@nikic
Copy link
Contributor

nikic commented Oct 18, 2022

Can't we just pass the argument unconditionally? LLVM 13 is out minimum version anyway.

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 18, 2022
…ondition, r=Amanieu

Retrieve LLVM version from llvm-filecheck binary if it is not set yet

In `rustc_codegen_gcc`, we run the `ASM` test suite. The problem is that, if a too recent version of the `llvm-filecheck` binary is provided, an extra argument needs to be passed and the to detect this version, it currently only expects a `--llvm-version` argument. With this, the version can be determined directly from the `llvm-filecheck` binary.

r? `@Amanieu`
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 19, 2022
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#101889 (doc: rewrite doc for uint::{carrying_add,borrowing_sub})
 - rust-lang#102507 (More slice::partition_point examples)
 - rust-lang#103164 (rustdoc: remove CSS ``@media` (min-width: 701px)`)
 - rust-lang#103189 (Clean up code-color and headers-color rustdoc GUI tests)
 - rust-lang#103203 (Retrieve LLVM version from llvm-filecheck binary if it is not set yet)
 - rust-lang#103204 (Add some more autolabels)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4012538 into rust-lang:master Oct 19, 2022
@rustbot rustbot added this to the 1.66.0 milestone Oct 19, 2022
@GuillaumeGomez GuillaumeGomez deleted the fix-llvm-runtools-condition branch October 19, 2022 08:54
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
Development

Successfully merging this pull request may close these issues.

6 participants