From 9170a0f02d1ed521dd6583661e17581f9b7102ec Mon Sep 17 00:00:00 2001 From: "Michael J. Spencer" Date: Mon, 27 Dec 2010 03:21:41 +0000 Subject: [PATCH] Support/PathV1: Deprecate GetRootDirectory. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@122580 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/PathV1.h | 3 ++- lib/Support/Unix/Path.inc | 11 +++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/llvm/Support/PathV1.h b/include/llvm/Support/PathV1.h index a22c40f51b3..fdf9084b5b3 100644 --- a/include/llvm/Support/PathV1.h +++ b/include/llvm/Support/PathV1.h @@ -98,7 +98,8 @@ namespace sys { /// it is file:///. Other operating systems may have different notions of /// what the root directory is or none at all. In that case, a consistent /// default root directory will be used. - static Path GetRootDirectory(); + LLVM_ATTRIBUTE_DEPRECATED(static Path GetRootDirectory(), + LLVMV_PATH_DEPRECATED_MSG(NOTHING)); /// Construct a path to a unique temporary directory that is created in /// a "standard" place for the operating system. The directory is diff --git a/lib/Support/Unix/Path.inc b/lib/Support/Unix/Path.inc index b21245c8207..886ba6bf6d4 100644 --- a/lib/Support/Unix/Path.inc +++ b/lib/Support/Unix/Path.inc @@ -242,12 +242,11 @@ Path::GetLLVMDefaultConfigDir() { Path Path::GetUserHomeDirectory() { const char* home = getenv("HOME"); - if (home) { - Path result; - if (result.set(home)) - return result; - } - return GetRootDirectory(); + Path result; + if (home && result.set(home)) + return result; + result.set("/"); + return result; } Path