[rebase]: fix PATH

rust-lang · May 19, 2015 · 617d7ef · 617d7ef
1 parent b7fd6d2
commit 617d7ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/configure b/configure
@@ -1135,6 +1135,7 @@ do
             CFG_MSVC_LIB_PATH=$(cmd /c "\"$vcvarsall\" amd64 && cmd /c echo %LIB%")
             need_ok "failed to learn about MSVC's LIB"
 
+            putvar CFG_MSVC_ROOT
             putvar CFG_MSVC_CL
             putvar CFG_MSVC_LIB
             putvar CFG_MSVC_LINK

diff --git a/mk/cfg/x86_64-pc-windows-msvc.mk b/mk/cfg/x86_64-pc-windows-msvc.mk
@@ -37,7 +37,7 @@ endif
 # but it's not the one that we want. As a result we make sure that our detected
 # `link.exe` shows up in PATH first.
 ifdef CFG_MSVC_LINK
-export PATH := $(dir $(CFG_MSVC_LINK)):$(PATH)
+export PATH := $(CFG_MSVC_ROOT)/VC/bin/amd64:$(PATH)
 endif
 
 # There are more comments about this available in the target specification for