Index: cfe-3.6.0.src/lib/Driver/Driver.cpp
===================================================================
--- cfe-3.6.0.src/lib/Driver/Driver.cpp
+++ cfe-3.6.0.src/lib/Driver/Driver.cpp
@@ -64,7 +64,7 @@ Driver::Driver(StringRef ClangExecutable
 
   // Compute the path to the resource directory.
   StringRef ClangResourceDir(CLANG_RESOURCE_DIR);
-  SmallString<128> P(Dir);
+  SmallString<128> P((Dir != "") ? Dir : "/opt/clang/bin/");
   if (ClangResourceDir != "") {
     llvm::sys::path::append(P, ClangResourceDir);
   } else {