Make -save-temps behave like in GCC 4.5.
The -save-temps option now behaves like described in GCC 4.5 release notes
(you can specify output directory for temporary files with -save-temps=obj
-o $DIRNAME). I do not have GCC 4.5 installed, so if there are any
inconsistencies between llvmc and GCC in the implementation of this
feature, please let me know.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@74190 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CompilerDriver/Tool.cpp b/lib/CompilerDriver/Tool.cpp
index 886b26b..e704dd9 100644
--- a/lib/CompilerDriver/Tool.cpp
+++ b/lib/CompilerDriver/Tool.cpp
@@ -11,16 +11,14 @@
//
//===----------------------------------------------------------------------===//
+#include "llvm/CompilerDriver/BuiltinOptions.h"
#include "llvm/CompilerDriver/Tool.h"
#include "llvm/System/Path.h"
-#include "llvm/Support/CommandLine.h"
using namespace llvm;
using namespace llvmc;
-extern cl::opt<std::string> OutputFilename;
-
namespace {
sys::Path MakeTempFile(const sys::Path& TempDir, const std::string& BaseName,
const std::string& Suffix) {
@@ -39,7 +37,7 @@
// NOTE: makeUnique always *creates* a unique temporary file,
// which is good, since there will be no races. However, some
// tools do not like it when the output file already exists, so
- // they have to be placated with -f or something like that.
+ // they need to be placated with -f or something like that.
Out.makeUnique(true, NULL);
return Out;
}
@@ -52,7 +50,7 @@
sys::Path Out;
if (StopCompilation) {
- if (!OutputFilename.empty()) {
+ if (!OutputFilename.empty() && SaveTemps != SaveTempsEnum::Obj ) {
Out.set(OutputFilename);
}
else if (IsJoin()) {