Specify PATH for executables on Windows

Author: jieyouxu

src/tools/run-make-support/src/lib.rs

@@ -89,11 +89,10 @@ impl AuxBuildInvocationBuilder {
 }
 
 fn run_common(bin_name: &str) -> (Command, Output) {
-    let bin_name = if std::env::var("TARGET").unwrap().contains("windows") {
-        format!("{}.exe", bin_name)
-    } else {
-        bin_name.to_owned()
-    };
+    let target = std::env::var("TARGET").unwrap();
+
+    let bin_name =
+        if target.contains("windows") { format!("{}.exe", bin_name) } else { bin_name.to_owned() };
 
     let mut bin_path = PathBuf::new();
     bin_path.push(std::env::var("TMPDIR").unwrap());
@@ -104,11 +103,19 @@ fn run_common(bin_name: &str) -> (Command, Output) {
         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_str(&std::env::var("TARGET_RPATH_DIR").unwrap());
+        target_rpath_env_path.push_str(&std::env::var("TARGET_RPATH_ENV").unwrap());
         target_rpath_env_path.push(':');
         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());
+        path.push(':');
+        path.push_str(&std::env::var("TARGET_RPATH_DIR").unwrap());
+        cmd.env("PATH", &path);
+    }
+
     let output = cmd.output().unwrap();
     (cmd, output)
 }