Index: lib/Driver/WindowsToolChain.cpp
===================================================================
--- lib/Driver/WindowsToolChain.cpp	(revision 158139)
+++ lib/Driver/WindowsToolChain.cpp	(working copy)
@@ -25,6 +25,8 @@
   #define NOGDI
   #define NOMINMAX
   #include <Windows.h>
+
+  static bool getVisualStudioDir(std::string &path);
 #endif
 
 using namespace clang::driver;
@@ -33,6 +35,12 @@
 
 Windows::Windows(const Driver &D, const llvm::Triple& Triple)
   : ToolChain(D, Triple) {
+  std::string path;
+  if (getVisualStudioDir(path)) {
+	path += "\\VC\\bin";
+	if (Triple.getArch() == llvm::Triple::x86_64) path += "\\amd64";
+	getProgramPaths().push_back(path);
+  }
 }
 
 Tool &Windows::SelectTool(const Compilation &C, const JobAction &JA,