From c09265a5fd94af5dcfd7325d0cb4f04197d65afc Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Mon, 15 Nov 2010 07:15:26 +0000 Subject: [PATCH] Clean up some names and fix the handling of default sysroots on Windows and other platforms where the textual default of '/' isn't the system's root directory. We should probably still make the textual default platform specific, but this should avoid the particularly bad problem with the previous state: we applied a sysroot of '/' to '/usr/local/google' which added '//usr/local/include' to the windows header search path, a share on another machine named 'usr'. Oops. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@119131 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Frontend/InitHeaderSearch.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/lib/Frontend/InitHeaderSearch.cpp b/lib/Frontend/InitHeaderSearch.cpp index 492dff84eb..733adbf8b9 100644 --- a/lib/Frontend/InitHeaderSearch.cpp +++ b/lib/Frontend/InitHeaderSearch.cpp @@ -41,13 +41,16 @@ class InitHeaderSearch { std::vector IncludeGroup[4]; HeaderSearch& Headers; bool Verbose; - llvm::sys::Path isysroot; + llvm::sys::Path IncludeSysroot; public: - InitHeaderSearch(HeaderSearch &HS, - bool verbose = false, const std::string &iSysroot = "") - : Headers(HS), Verbose(verbose), isysroot(iSysroot) {} + InitHeaderSearch(HeaderSearch &HS, bool verbose, llvm::StringRef sysroot) + : Headers(HS), Verbose(verbose), + IncludeSysroot((sysroot.empty() || sysroot == "/") ? + llvm::sys::Path::GetRootDirectory() : + llvm::sys::Path(sysroot)) { + } /// AddPath - Add the specified path to the specified group list. void AddPath(const llvm::Twine &Path, IncludeDirGroup Group, @@ -107,11 +110,11 @@ void InitHeaderSearch::AddPath(const llvm::Twine &Path, llvm::sys::Path MappedPath(MappedPathStr); // Handle isysroot. - if (Group == System && !IgnoreSysRoot && MappedPath.isAbsolute()) { - // Prepend isysroot if present. - if (isysroot.isValid() && isysroot.isAbsolute() && - isysroot != llvm::sys::Path::GetRootDirectory()) - MappedPathStr = (isysroot.str() + Path).toStringRef(MappedPathStorage); + if (Group == System && !IgnoreSysRoot && MappedPath.isAbsolute() && + IncludeSysroot.isValid() && IncludeSysroot.isAbsolute() && + IncludeSysroot != llvm::sys::Path::GetRootDirectory()) { + MappedPathStr = + (IncludeSysroot.str() + Path).toStringRef(MappedPathStorage); } // Compute the DirectoryLookup type. -- 2.40.0