2 files changed, 13 insertions, 1 deletions
diff --git a/lib/CompilerDriver/BuiltinOptions.cpp b/lib/CompilerDriver/BuiltinOptions.cpp
index a3364e8a72..126346f68d 100644
--- a/lib/CompilerDriver/BuiltinOptions.cpp
+++ b/lib/CompilerDriver/BuiltinOptions.cpp
@@ -52,4 +52,5 @@ cl::opt<SaveTempsEnum::Values> SaveTemps
                        "Use current working directory"),
             clEnumValN(SaveTempsEnum::Obj, "", "Same as 'cwd'"),
             clEnumValEnd),
- cl::ValueOptional);
+ //cl::ValueOptional);
+ cl::Hidden);
diff --git a/lib/CompilerDriver/Main.cpp b/lib/CompilerDriver/Main.cpp
index 7d1a3d8fbc..f4cacb38f1 100644
--- a/lib/CompilerDriver/Main.cpp
+++ b/lib/CompilerDriver/Main.cpp
@@ -31,6 +31,17 @@ namespace {
   sys::Path getTempDir() {
     sys::Path tempDir;
 
+/////////////////////////////////////////////
+    std::string p = "tmp-objs";
+    tempDir = sys::Path(p);
+      if (!tempDir.exists()) {
+        std::string ErrMsg;
+        if (tempDir.createDirectoryOnDisk(true, &ErrMsg))
+          throw std::runtime_error(ErrMsg);
+      }
+    return tempDir;
+/////////////////////////////////////////////
+
     // GCC 4.5-style -save-temps handling.
     if (SaveTemps == SaveTempsEnum::Unset) {
       tempDir = sys::Path::GetTemporaryDirectory();