From 0f0cdab31a4f71914b7f654501d69d96e9f378da Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Mon, 2 May 2011 04:50:10 +0000 Subject: lib/Frontend/InitHeaderSearch.cpp: Tweak AddPath() to accept "/foo/bar" (not "X:\foo\bar") with -isysroot. test/PCH/reloc.c can pass. FIXME: We should consider better isysroot scheme on Win32 hosts. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@130683 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Frontend/InitHeaderSearch.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib/Frontend/InitHeaderSearch.cpp') diff --git a/lib/Frontend/InitHeaderSearch.cpp b/lib/Frontend/InitHeaderSearch.cpp index 3da38fb046..c552512dc9 100644 --- a/lib/Frontend/InitHeaderSearch.cpp +++ b/lib/Frontend/InitHeaderSearch.cpp @@ -118,7 +118,12 @@ void InitHeaderSearch::AddPath(const llvm::Twine &Path, // Handle isysroot. if ((Group == System || Group == CXXSystem) && !IgnoreSysRoot && +#if defined(_WIN32) + !MappedPathStr.empty() && + llvm::sys::path::is_separator(MappedPathStr[0]) && +#else llvm::sys::path::is_absolute(MappedPathStr) && +#endif IsNotEmptyOrRoot) { MappedPathStorage.clear(); MappedPathStr = -- cgit v1.2.3-70-g09d2