bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #13010 - Veykril:build-script-probes, r=Veykril

Browse source 
Do not unconditionally succeed RUSTC_WRAPPER checks when run by build scripts

rust-analyzer's RUSTC_WRAPPER unconditionally succeeds `cargo check`
invocations tripping up build scripts using `cargo check` to probe for
successful compilations. To prevent this from happening the RUSTC_WRAPPER
now checks if it's run from a build script by looking for the
`CARGO_CFG_TARGET_ARCH` env var that cargo sets only when running build
scripts.
This commit is contained in:
bors 2022-08-13 14:12:38 +00:00
commit 5941dec0c1
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/rust-analyzer/src/bin/rustc_wrapper.rs
View file

@ -17,6 +17,11 @@ pub(crate) fn run_rustc_skipping_cargo_checking(
rustc_executable: OsString, rustc_executable: OsString,
args: Vec<OsString>, args: Vec<OsString>,
) -> io::Result<ExitCode> { ) -> io::Result<ExitCode> {
// `CARGO_CFG_TARGET_ARCH` is only set by cargo when executing build scripts
// We don't want to exit out checks unconditionally with success if a build
// script tries to invoke checks themselves
// See https://github.com/rust-lang/rust-analyzer/issues/12973 for context
let not_invoked_by_build_script = std::env::var_os("CARGO_CFG_TARGET_ARCH").is_none();
let is_cargo_check = args.iter().any(|arg| { let is_cargo_check = args.iter().any(|arg| {
let arg = arg.to_string_lossy(); let arg = arg.to_string_lossy();
// `cargo check` invokes `rustc` with `--emit=metadata` argument. // `cargo check` invokes `rustc` with `--emit=metadata` argument.
@ -29,7 +34,7 @@ pub(crate) fn run_rustc_skipping_cargo_checking(
// The default output filename is CRATE_NAME.rmeta. // The default output filename is CRATE_NAME.rmeta.
arg.starts_with("--emit=") && arg.contains("metadata") && !arg.contains("link") arg.starts_with("--emit=") && arg.contains("metadata") && !arg.contains("link")
}); });
if is_cargo_check { if not_invoked_by_build_script && is_cargo_check {
return Ok(ExitCode(Some(0))); return Ok(ExitCode(Some(0)));
} }
run_rustc(rustc_executable, args) run_rustc(rustc_executable, args)