diff options
| -rw-r--r-- | lldb/source/Host/android/HostInfoAndroid.cpp | 15 | ||||
| -rw-r--r-- | lldb/source/Host/common/HostInfoBase.cpp | 17 |
2 files changed, 19 insertions, 13 deletions
diff --git a/lldb/source/Host/android/HostInfoAndroid.cpp b/lldb/source/Host/android/HostInfoAndroid.cpp index 3fa50ec8ddf..a5695f686a3 100644 --- a/lldb/source/Host/android/HostInfoAndroid.cpp +++ b/lldb/source/Host/android/HostInfoAndroid.cpp @@ -91,14 +91,11 @@ HostInfoAndroid::ResolveLibraryPath(const std::string& module_path, const ArchSp bool HostInfoAndroid::ComputeTempFileBaseDirectory(FileSpec &file_spec) { - bool success = HostInfoLinux::ComputeTempFileBaseDirectory(file_spec); + if (HostInfoLinux::ComputeTempFileBaseDirectory(file_spec)) + return true; - // On Android, there is no path which is guaranteed to be writable. If the user has not - // provided a path via an environment variable, the generic algorithm will deduce /tmp, which - // is plain wrong. In that case we have an invalid directory, we substitute the path with - // /data/local/tmp, which is correct at least in some cases (i.e., when running as shell user). - if (!success || !file_spec.Exists()) - file_spec = FileSpec("/data/local/tmp", false); - - return file_spec.Exists(); + // If the default mechanism for computing the temp directory failed then + // fall back to /data/local/tmp + file_spec = FileSpec("/data/local/tmp", false); + return true; } 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; } |
