Support for storing tmpfile someplace else

Author: manorom

clang/tools/nec-aurora-build/compiler.cpp

@@ -40,7 +40,7 @@ int runSourceTransformation(const std::string &InputPath,
 
   // We create an empty temp file
   std::string Content = "";
-  std::string TmpFile = writeTmpFile(Content, InputFileNameWE, InputFileExt);
+  std::string TmpFile = writeTmpFile(Content, InputFileNameWE + ".sotoc-transformed", InputFileExt);
   if (TmpFile == "")
     return -1;
 
@@ -62,10 +62,15 @@ int runTargetCompiler(const std::string &InputPath, const std::string &Args) {
   CmdLine << getTargetCompiler() << " -c " << InputPath << " " << Args;
 
   if (Verbose) {
-    std::cout << "  \"" << CmdLine.str() << std::endl;
+    std::cout << "  \"" << CmdLine.str() << "\"" << std::endl;
   }
 
   int ret = system(CmdLine.str().c_str());
 
+  if (!KeepTransformedFilesDir) {
+    std::cout << "Removing tmpfil" << std::endl;
+    std::remove(InputPath.c_str());
+  }
+
   return ret;
 }

clang/tools/nec-aurora-build/necaurora-ofld-wrapper.cpp

@@ -28,8 +28,10 @@
 #include "necaurora-ofld-wrapper.h"
 
 bool Verbose = false;
+const char *KeepTransformedFilesDir;
 bool SaveTemps = false;
 
+
 enum class ToolMode {
   Unknown,
   Compiler,
@@ -95,6 +97,7 @@ int parseCmdline(int argc, char **argv, ToolMode &Mode, std::string &SotocPath,
     if (StaticLinkerFlag) {
       Mode = ToolMode::StaticLinker;
     } else {
+      Mode = ToolMode::Passthrough;
       if (SharedFlag) {
         ArgsStream << "-shared";
       }
@@ -129,6 +132,8 @@ int main(int argc, char **argv) {
   std::string Args;
   std::vector<const char *> ObjectFiles;
 
+  KeepTransformedFilesDir = std::getenv("NECAURORA_KEEP_FILES_DIR");
+
   rc = parseCmdline(argc, argv, Mode, SotocPath, InputFile, Args, Verbose,
                     SaveTemps, ObjectFiles);
   if (rc != 0) {
@@ -148,7 +153,6 @@ int main(int argc, char **argv) {
     }
 
     rc = runTargetCompiler(SotocOutputPath, Args);
-    std::remove(SotocOutputPath.c_str());
 
     if (rc != 0) {
       std::cerr << "necaurora-ofld-wrapper: "

clang/tools/nec-aurora-build/necaurora-ofld-wrapper.h

@@ -7,6 +7,8 @@
 
 extern bool Verbose;
 
+extern const char *KeepTransformedFilesDir;
+
 int runSourceTransformation(const std::string &InputPath,
                             const std::string &SotocPath,
                             std::string &OutputPath,

clang/tools/nec-aurora-build/utils.cpp

@@ -36,7 +36,12 @@ const char *getTargetCompiler() {
 
 std::string writeTmpFile(const std::string &Content, const std::string &Prefix,
                          const std::string &Extension) {
-  std::string TmpPath = getTmpDir();
+  std::string TmpPath;
+  if (KeepTransformedFilesDir) {
+    TmpPath = KeepTransformedFilesDir;
+  } else  {
+    TmpPath = getTmpDir();
+  }
 
   // because mkstemp wants the last n chars to be 'X', we have to add the
   // extension laster