diff --git a/clang/tools/nec-aurora-build/necaurora-ofld-wrapper.cpp b/clang/tools/nec-aurora-build/necaurora-ofld-wrapper.cpp
index c5a22b82138f17c..35de3e04da680fa 100644
--- a/clang/tools/nec-aurora-build/necaurora-ofld-wrapper.cpp
+++ b/clang/tools/nec-aurora-build/necaurora-ofld-wrapper.cpp
@@ -48,6 +48,7 @@ int parseCmdline(int argc, char **argv, ToolMode &Mode, std::string &SotocPath,
   Mode = ToolMode::Unknown;
   bool StaticLinkerFlag = false;
   bool SharedFlag = false;
+  bool SaveTempsFlag = false;
   SotocPath = "sotoc";
   // TODO make this more flexible
   InputFile = argv[1];
@@ -84,6 +85,9 @@ int parseCmdline(int argc, char **argv, ToolMode &Mode, std::string &SotocPath,
     } else if (strcmp(argv[i], "-shared") == 0) {
       SharedFlag = true;
       continue;
+    } else if (strcmp(argv[i], "-save-temps") == 0) {
+      SaveTempsFlag = true;
+      continue;
     } else if (strcmp(argv[i] + strlen(argv[i] - 2), ".o") == 0) {
       ArgsStream << argv[i] << " ";
       ObjectFiles.push_back(argv[i]);
@@ -97,6 +101,10 @@ int parseCmdline(int argc, char **argv, ToolMode &Mode, std::string &SotocPath,
     }
   }
 
+  if (SaveTempsFlag && !KeepTransformedFilesDir) {
+    KeepTransformedFilesDir = get_current_dir_name();
+  }
+
   if (Mode == ToolMode::Unknown) {
 
     if (StaticLinkerFlag) {
@@ -114,6 +122,7 @@ int parseCmdline(int argc, char **argv, ToolMode &Mode, std::string &SotocPath,
   } else {
     Args = ArgsStream.str();
   }
+
   return 0;
 }