Skip to content

Commit 2fb1557

Browse files
authored
Preserve existing paths when adding rustc_codegen_spirv (#61)
1 parent 924d0ab commit 2fb1557

File tree

1 file changed

+8
-1
lines changed
  • crates/spirv-builder-cli/src

1 file changed

+8
-1
lines changed

crates/spirv-builder-cli/src/main.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,14 @@ const fn dylib_path_envvar() -> &'static str {
3737

3838
fn set_codegen_spirv_location(dylib_path: std::path::PathBuf) {
3939
let env_var = dylib_path_envvar();
40-
let path = dylib_path.parent().unwrap().display().to_string();
40+
let existing_paths_str = std::env::var(env_var).unwrap();
41+
let mut dylib_paths = std::env::split_paths(&existing_paths_str).collect::<Vec<_>>();
42+
43+
let dylib_path = dylib_path.parent().unwrap().to_path_buf();
44+
dylib_paths.insert(0, dylib_path);
45+
46+
let path = std::env::join_paths(dylib_paths).unwrap().into_string().unwrap();
47+
4148
log::debug!("Setting OS-dependent DLL ENV path ({env_var}) to: {path}");
4249
std::env::set_var(env_var, path);
4350
}

0 commit comments

Comments
 (0)