commit ca9678e9a5f608a717f46d97f86fab52d0e272b5
author Alex Crichton <alex@alexcrichton.com> Thu Jun 01 20:30:04 2017
committer GitHub <noreply@github.com> Thu Jun 01 20:30:04 2017
tree 4282f85700e3c5dc0bcdca712a01b6c8e541161b
parent e9d57f06e242c436bc482e7badbf1647e40d1f1d
parent f6be9a725548b6d271a61fdb02b06cf0cf9da6bc

Merge pull request #166 from brson/vs2017

Only add the 'host dylib path' to the MSVC 2017 PATH

src/windows_registry.rs

diff --git a/src/windows_registry.rs b/src/windows_registry.rs
index 09fa940..3575809 100644
--- a/src/windows_registry.rs
+++ b/src/windows_registry.rs
@@ -218,13 +218,12 @@
 
     fn tool_from_vs15_instance(tool: &str, target: &str,
                                instance: &SetupInstance) -> Option<Tool> {
-        let (bin_path, host_bin_path, lib_path, include_path) = otry!(vs15_vc_paths(target, instance));
+        let (bin_path, host_dylib_path, lib_path, include_path) = otry!(vs15_vc_paths(target, instance));
         let tool_path = bin_path.join(tool);
         if !tool_path.exists() { return None };
 
         let mut tool = MsvcTool::new(tool_path);
-        tool.path.push(bin_path.clone());
-        tool.path.push(host_bin_path);
+        tool.path.push(host_dylib_path);
         tool.libs.push(lib_path);
         tool.include.push(include_path);
 
@@ -259,10 +258,10 @@
         // But! we also need PATH to contain the target directory for the host
         // architecture, because it contains dlls like mspdb140.dll compiled for
         // the host architecture.
-        let host_bin_path = path.join("bin").join(&format!("Host{}", host)).join(&host.to_lowercase());
+        let host_dylib_path = path.join("bin").join(&format!("Host{}", host)).join(&host.to_lowercase());
         let lib_path = path.join("lib").join(&target);
         let include_path = path.join("include");
-        Some((bin_path, host_bin_path, lib_path, include_path))
+        Some((bin_path, host_dylib_path, lib_path, include_path))
     }
 
     fn atl_paths(target: &str, path: &Path) -> Option<(PathBuf, PathBuf)> {