summaryrefslogtreecommitdiffstats
path: root/clang/lib/Frontend/InitHeaderSearch.cpp
diff options
context:
space:
mode:
authorNAKAMURA Takumi <geek4civic@gmail.com>2011-05-02 04:50:10 +0000
committerNAKAMURA Takumi <geek4civic@gmail.com>2011-05-02 04:50:10 +0000
commitc3a85292697f9a2ec70cc4e5603823f60f6e7c22 (patch)
tree00241dc7d457e21a65f7f1040201f6e4eef7ee46 /clang/lib/Frontend/InitHeaderSearch.cpp
parentbb9ffbdc89b363bfe37380db57a3de96c511f035 (diff)
downloadbcm5719-llvm-c3a85292697f9a2ec70cc4e5603823f60f6e7c22.tar.gz
bcm5719-llvm-c3a85292697f9a2ec70cc4e5603823f60f6e7c22.zip
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. llvm-svn: 130683
Diffstat (limited to 'clang/lib/Frontend/InitHeaderSearch.cpp')
-rw-r--r--clang/lib/Frontend/InitHeaderSearch.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/clang/lib/Frontend/InitHeaderSearch.cpp b/clang/lib/Frontend/InitHeaderSearch.cpp
index 3da38fb0463..c552512dc95 100644
--- a/clang/lib/Frontend/InitHeaderSearch.cpp
+++ b/clang/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 =
OpenPOWER on IntegriCloud