Respect PATH separator platform differences

rust-lang · Feb 29, 2024 · df7a627 · df7a627
1 parent ef8f096
commit df7a627
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/tools/run-make-support/src/lib.rs b/src/tools/run-make-support/src/lib.rs
@@ -88,6 +88,10 @@ impl AuxBuildInvocationBuilder {
     }
 }
 
+fn path_sep(target: &str) -> char {
+    if target.contains("windows") { ';' } else { ':' }
+}
+
 fn run_common(bin_name: &str) -> (Command, Output) {
     let target = std::env::var("TARGET").unwrap();
 
@@ -102,18 +106,16 @@ fn run_common(bin_name: &str) -> (Command, Output) {
     cmd.env(&ld_lib_path_envvar, {
         let mut target_rpath_env_path = String::new();
         target_rpath_env_path.push_str(&std::env::var("TMPDIR").unwrap());
-        target_rpath_env_path.push(':');
+        target_rpath_env_path.push(path_sep(&target));
         target_rpath_env_path.push_str(&std::env::var("TARGET_RPATH_ENV").unwrap());
-        target_rpath_env_path.push(':');
+        target_rpath_env_path.push(path_sep(&target));
         target_rpath_env_path.push_str(&std::env::var(&ld_lib_path_envvar).unwrap());
         target_rpath_env_path
     });
 
     if target.contains("windows") {
         let mut path = std::env::var("PATH").unwrap_or(String::new());
-        if !path.is_empty() {
-            path.push(':');
-        }
+        path.push(path_sep(&target));
         path.push_str(&std::env::var("TARGET_RPATH_DIR").unwrap());
         cmd.env("PATH", &path);
     }