diff options
author | Pavel Labath <labath@google.com> | 2015-10-15 14:46:46 +0000 |
---|---|---|
committer | Pavel Labath <labath@google.com> | 2015-10-15 14:46:46 +0000 |
commit | 141051027bdb9beaa4cb0a93c15e8cf3fbc64510 (patch) | |
tree | 7f45a9d6f03fdf015d8b96ff89bc48929b753150 /lldb/source/Host/common | |
parent | 668af71b828691ff4b49a43e53a6783dad0a16f7 (diff) | |
download | bcm5719-llvm-141051027bdb9beaa4cb0a93c15e8cf3fbc64510.tar.gz bcm5719-llvm-141051027bdb9beaa4cb0a93c15e8cf3fbc64510.zip |
Revert "Fix temporary directory computation on linux (pr25147)"
I actually did not want to commit this without review, but I mistyped. :/
llvm-svn: 250412
Diffstat (limited to 'lldb/source/Host/common')
-rw-r--r-- | lldb/source/Host/common/HostInfoBase.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/lldb/source/Host/common/HostInfoBase.cpp b/lldb/source/Host/common/HostInfoBase.cpp index 0f4324f83dd..3cb00a875e2 100644 --- a/lldb/source/Host/common/HostInfoBase.cpp +++ b/lldb/source/Host/common/HostInfoBase.cpp @@ -20,7 +20,6 @@ #include "llvm/ADT/Triple.h" #include "llvm/ADT/StringExtras.h" #include "llvm/Support/Host.h" -#include "llvm/Support/Path.h" #include "llvm/Support/raw_ostream.h" #include <thread> @@ -345,9 +344,19 @@ HostInfoBase::ComputeProcessTempFileDirectory(FileSpec &file_spec) bool HostInfoBase::ComputeTempFileBaseDirectory(FileSpec &file_spec) { - llvm::SmallVector<char, 16> tmpdir; - llvm::sys::path::system_temp_directory(/*ErasedOnReboot*/ true, tmpdir); - file_spec = FileSpec(std::string(tmpdir.data(), tmpdir.size()), true); + file_spec.Clear(); + + const char *tmpdir_cstr = getenv("TMPDIR"); + if (tmpdir_cstr == nullptr) + { + tmpdir_cstr = getenv("TMP"); + if (tmpdir_cstr == nullptr) + tmpdir_cstr = getenv("TEMP"); + } + if (!tmpdir_cstr) + return false; + + file_spec = FileSpec(tmpdir_cstr, false); return true; } |