commit 3ea9e33ea25e0c2b12db56418ba3f994eb662c04
author Pirama Arumuga Nainar <pirama@google.com> Wed Apr 08 08:57:32 2015 -0700
committer Pirama Arumuga Nainar <pirama@google.com> Wed Apr 08 08:57:32 2015 -0700
tree 637e49f749220fd9b0141bff6bbe5ee972fdedd6
parent ce7e695396b9715fd06e18f7412c860a313661cd

Update aosp/master clang for rebase to r233350

Change-Id: I12d4823f10bc9e445b8b86e7721b71f98d1df442

lib/Driver/CrossWindowsToolChain.cpp

diff --git a/lib/Driver/CrossWindowsToolChain.cpp b/lib/Driver/CrossWindowsToolChain.cpp
index 03fe41b..82456e7 100644
--- a/lib/Driver/CrossWindowsToolChain.cpp
+++ b/lib/Driver/CrossWindowsToolChain.cpp
@@ -60,7 +60,7 @@
   if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
     SmallString<128> ResourceDir(D.ResourceDir);
     llvm::sys::path::append(ResourceDir, "include");
-    addSystemInclude(DriverArgs, CC1Args, ResourceDir.str());
+    addSystemInclude(DriverArgs, CC1Args, ResourceDir);
   }
   addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include");
 }