Skip to content

fix: Fix invalid -O flag used by cfg discovery #18789

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.

Sign up for GitHub

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
Dec 29, 2024
Merged

fix: Fix invalid -O flag used by cfg discovery #18789

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions crates/project-model/src/toolchain_info/rustc_cfg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,26 @@ pub fn get(
}
};

let rustc_cfgs = rustc_cfgs.lines().map(crate::parse_cfg).collect::<Result<Vec<_>, _>>();
// These are unstable but the standard libraries gate on them.
let unstable = vec![
r#"target_has_atomic_equal_alignment="8""#,
r#"target_has_atomic_equal_alignment="16""#,
r#"target_has_atomic_equal_alignment="32""#,
r#"target_has_atomic_equal_alignment="64""#,
r#"target_has_atomic_equal_alignment="128""#,
r#"target_has_atomic_equal_alignment="ptr""#,
r#"target_has_atomic_load_store"#,
r#"target_has_atomic_load_store="8""#,
r#"target_has_atomic_load_store="16""#,
r#"target_has_atomic_load_store="32""#,
r#"target_has_atomic_load_store="64""#,
r#"target_has_atomic_load_store="128""#,
r#"target_has_atomic_load_store="ptr""#,
r#"target_thread_local"#,
r#"target_has_atomic"#,
];
let rustc_cfgs =
rustc_cfgs.lines().chain(unstable).map(crate::parse_cfg).collect::<Result<Vec<_>, _>>();
match rustc_cfgs {
Ok(rustc_cfgs) => {
tracing::debug!(?rustc_cfgs, "rustc cfgs found");
Expand All @@ -42,13 +61,14 @@ fn rustc_print_cfg(
extra_env: &FxHashMap<String, String>,
config: QueryConfig<'_>,
) -> anyhow::Result<String> {
const RUSTC_ARGS: [&str; 3] = ["--print", "cfg", "-O"];
const RUSTC_ARGS: [&str; 2] = ["--print", "cfg"];
let (sysroot, current_dir) = match config {
QueryConfig::Cargo(sysroot, cargo_toml) => {
let mut cmd = sysroot.tool(Tool::Cargo, cargo_toml.parent());
cmd.envs(extra_env);
cmd.env("RUSTC_BOOTSTRAP", "1");
cmd.args(["rustc", "-Z", "unstable-options"]).args(RUSTC_ARGS);
cmd.args(["--", "-O"]);
if let Some(target) = target {
cmd.args(["--target", target]);
}
Expand All @@ -70,6 +90,7 @@ fn rustc_print_cfg(
let mut cmd = sysroot.tool(Tool::Rustc, current_dir);
cmd.envs(extra_env);
cmd.args(RUSTC_ARGS);
cmd.arg("-O");
if let Some(target) = target {
cmd.args(["--target", target]);
}
Expand Down
Loading