File tree Expand file tree Collapse file tree 1 file changed +8
-1
lines changed
crates/spirv-builder-cli/src Expand file tree Collapse file tree 1 file changed +8
-1
lines changed Original file line number Diff line number Diff line change @@ -37,7 +37,14 @@ const fn dylib_path_envvar() -> &'static str {
37
37
38
38
fn set_codegen_spirv_location ( dylib_path : std:: path:: PathBuf ) {
39
39
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
+
41
48
log:: debug!( "Setting OS-dependent DLL ENV path ({env_var}) to: {path}" ) ;
42
49
std:: env:: set_var ( env_var, path) ;
43
50
}
You can’t perform that action at this time.
0 commit comments