Use join_paths and var_os to build ld_lib_path

rust-lang · Mar 20, 2024 · 6cad5f0 · 6cad5f0
1 parent 897200d
commit 6cad5f0
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/tools/run-make-support/src/lib.rs b/src/tools/run-make-support/src/lib.rs
@@ -9,10 +9,17 @@ pub fn add_host_rpath_env(cmd: &mut Command) {
     let ld_lib_path_envvar = env::var("LD_LIB_PATH_ENVVAR").unwrap();
     let ld_lib_path_value = env::var(&ld_lib_path_envvar).unwrap();
 
-    let temp = env::var("TMPDIR").unwrap();
-    let host_rpath_dir = env::var("HOST_RPATH_DIR").unwrap();
+    let temp = env::var_os("TMPDIR").unwrap();
+    let host_rpath_dir = env::var_os("HOST_RPATH_DIR").unwrap();
 
-    cmd.env(ld_lib_path_envvar, format!("{temp}:{host_rpath_dir}:{ld_lib_path_value}"));
+    let mut paths = Vec::from([temp, host_rpath_dir]);
+    for p in env::split_paths(&ld_lib_path_value) {
+        paths.push(p.into_os_string());
+    }
+
+    let path = std::env::join_paths(paths).unwrap();
+
+    cmd.env(ld_lib_path_envvar, path);
 }
 
 pub fn out_dir() -> PathBuf {