Skip to content

rustc_llvm: add missing - to flag-comparison logic#153419

Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
durin42:missing-dashes
Mar 5, 2026
Merged

rustc_llvm: add missing - to flag-comparison logic#153419
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
durin42:missing-dashes

Conversation

@durin42
Copy link
Contributor

@durin42 durin42 commented Mar 4, 2026

The build script here wants to sniff for -stdlib=libc++ but was missing the leading dashes. We caught this on the Rust/LLVM HEADs builder which also uses libc++.

The build script here wants to sniff for `-stdlib=libc++` but was
missing the leading dashes. We caught this on the Rust/LLVM HEADs
builder which also uses libc++.
@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 4, 2026
@rustbot
Copy link
Collaborator

rustbot commented Mar 4, 2026

r? @cuviper

rustbot has assigned @cuviper.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: @cuviper

@durin42
Copy link
Contributor Author

durin42 commented Mar 4, 2026

@rustbot label: +llvm-main

(not really llvm-main specific, but blocking our CI from passing)

@rustbot rustbot added the llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) label Mar 4, 2026
@cuviper
Copy link
Member

cuviper commented Mar 5, 2026

Ah, before #152712 it was doing a substring search, so the dashes didn't matter.

@bors r+ rollup

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 5, 2026

📌 Commit cbc711e has been approved by cuviper

It is now in the queue for this repository.

🌲 The tree is currently closed for pull requests below priority 1000. This pull request will be tested once the tree is reopened.

@rust-bors rust-bors bot 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 Mar 5, 2026
rust-bors bot pushed a commit that referenced this pull request Mar 5, 2026
…uwer

Rollup of 8 pull requests

Successful merges:

 - #153361 (enable `PassMode::Indirect { on_stack: true, .. }` tail call arguments)
 - #153369 (library/test: always enable unstable features for miri)
 - #152283 (Properly pass offload sizes to kernel args)
 - #153323 (Remove `impl QueryVTable`)
 - #153385 (Fix comment on `is_horizontal_whitespace`)
 - #153394 (fix(thir): Include `NoneWithError` in Enum Struct Tail Assertion)
 - #153419 (rustc_llvm: add missing `-` to flag-comparison logic)
 - #153423 (Update dispatch2 to v0.3.1)
@rust-bors rust-bors bot merged commit b8a919a into rust-lang:main Mar 5, 2026
11 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 5, 2026
rust-timer added a commit that referenced this pull request Mar 5, 2026
Rollup merge of #153419 - durin42:missing-dashes, r=cuviper

rustc_llvm: add missing `-` to flag-comparison logic

The build script here wants to sniff for `-stdlib=libc++` but was missing the leading dashes. We caught this on the Rust/LLVM HEADs builder which also uses libc++.
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Mar 5, 2026
…risDenton

Use shlex instead of shell-words

In rust-lang#152712, the [`shell-words`] crate was introduced as a new dependency of `rustc_llvm` in order for its build script to parse the output of `llvm-config --quote-paths` and thereby handle paths containing whitespace; however, as [noted by bjorn3], that build script already transitively depends upon the [`shlex`] crate (via the [`cc`] crate) which provides similar functionality.

This patch is based off (the already-approved) rust-lang#153419, which would otherwise conflict.

[`cc`]: https://crates.io/crates/cc
[noted by bjorn3]: rust-lang#152712 (comment)
[`shell-words`]: https://crates.io/crates/shell-words
[`shlex`]: https://crates.io/crates/shlex

r? ChrisDenton
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Mar 5, 2026
…risDenton

Use shlex instead of shell-words

In rust-lang#152712, the [`shell-words`] crate was introduced as a new dependency of `rustc_llvm` in order for its build script to parse the output of `llvm-config --quote-paths` and thereby handle paths containing whitespace; however, as [noted by bjorn3], that build script already transitively depends upon the [`shlex`] crate (via the [`cc`] crate) which provides similar functionality.

This patch is based off (the already-approved) rust-lang#153419, which would otherwise conflict.

[`cc`]: https://crates.io/crates/cc
[noted by bjorn3]: rust-lang#152712 (comment)
[`shell-words`]: https://crates.io/crates/shell-words
[`shlex`]: https://crates.io/crates/shlex

r? ChrisDenton
rust-timer added a commit that referenced this pull request Mar 5, 2026
Rollup merge of #153436 - eggyal:shlex-not-shell_words, r=ChrisDenton

Use shlex instead of shell-words

In #152712, the [`shell-words`] crate was introduced as a new dependency of `rustc_llvm` in order for its build script to parse the output of `llvm-config --quote-paths` and thereby handle paths containing whitespace; however, as [noted by bjorn3], that build script already transitively depends upon the [`shlex`] crate (via the [`cc`] crate) which provides similar functionality.

This patch is based off (the already-approved) #153419, which would otherwise conflict.

[`cc`]: https://crates.io/crates/cc
[noted by bjorn3]: #152712 (comment)
[`shell-words`]: https://crates.io/crates/shell-words
[`shlex`]: https://crates.io/crates/shlex

r? ChrisDenton
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants