Skip to content

prevent env vars leaking into install #97

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
Firestar99 merged 3 commits into from
Jul 4, 2025
Merged

prevent env vars leaking into install #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
faf0a47
prevent env vars from leaking into install
Firestar99 Jul 4, 2025
bd774f4
fix clippy
Firestar99 Jul 4, 2025
a3dfdea
fix clippy in test code
Firestar99 Jul 4, 2025
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
30 changes: 22 additions & 8 deletions crates/cargo-gpu/src/install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use crate::target_specs::update_target_specs_files;
use crate::{cache_dir, spirv_source::SpirvSource};
use anyhow::Context as _;
use spirv_builder::SpirvBuilder;
use std::env;
use std::path::{Path, PathBuf};

/// Represents a functional backend installation, whether it was cached or just installed.
Expand Down Expand Up @@ -279,20 +280,33 @@ package = "rustc_codegen_spirv"
}

crate::user_output!("Compiling `rustc_codegen_spirv` from source {}\n", source,);
let mut build_command = std::process::Command::new("cargo");
build_command
let mut cargo = std::process::Command::new("cargo");
cargo
.current_dir(&install_dir)
.arg(format!("+{toolchain_channel}"))
.args(["build", "--release"])
.env_remove("RUSTC")
.env_remove("RUSTFLAGS");
.args(["build", "--release"]);
if source.is_path() {
build_command.args(["-p", "rustc_codegen_spirv", "--lib"]);
cargo.args(["-p", "rustc_codegen_spirv", "--lib"]);
}

log::debug!("building artifacts with `{build_command:?}`");
// Clear Cargo environment variables that we don't want to leak into the
// inner invocation of Cargo and mess with our `rustc_codegen_spirv` build.
for (key, _) in env::vars_os() {
let remove = key.to_str().is_some_and(|st| {
st.starts_with("CARGO_FEATURES_") || st.starts_with("CARGO_CFG_")
});
if remove {
cargo.env_remove(key);
}
}
cargo
.env_remove("RUSTC")
.env_remove("RUSTFLAGS")
// ignore any externally supplied target dir, we want to build it in our cache dir
.env_remove("CARGO_TARGET_DIR");

build_command
log::debug!("building artifacts with `{cargo:?}`");
cargo
.stdout(std::process::Stdio::inherit())
.stderr(std::process::Stdio::inherit())
.output()
Expand Down
6 changes: 3 additions & 3 deletions crates/cargo-gpu/src/spirv_source.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ mod test {
url: "https://github.com/Rust-GPU/rust-gpu".to_owned(),
rev: "86fc4803".to_owned(),
}
)
);
}

#[test_log::test]
Expand All @@ -309,15 +309,15 @@ mod test {
url: "https://github.com/Rust-GPU/rust-gpu.git".to_owned(),
rev: "6e2c84d4fe64e32df4c060c5a7f3e35a32e45421".to_owned(),
}
)
);
}

fn parse_git(source: &str) -> SpirvSource {
let package = PackageBuilder::new(
"spirv-std",
Version::new(0, 9, 0),
PackageId {
repr: "".to_owned(),
repr: String::new(),
},
"",
)
Expand Down