summaryrefslogtreecommitdiffstats
path: root/clang/lib/Frontend
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2013-01-29 23:59:37 +0000
committerDaniel Dunbar <daniel@zuster.org>2013-01-29 23:59:37 +0000
commit2e8eb01a71841d4cefe589aaa7948ddd437925ea (patch)
tree3d952f37fe91fdc1683f77ddfdabf22c0f47fd99 /clang/lib/Frontend
parentc5103c3f3ea6ce13a43f7852efa9cbafca50a369 (diff)
downloadbcm5719-llvm-2e8eb01a71841d4cefe589aaa7948ddd437925ea.tar.gz
bcm5719-llvm-2e8eb01a71841d4cefe589aaa7948ddd437925ea.zip
[Frontend] Factor out helper function, for clarity.
llvm-svn: 173853
Diffstat (limited to 'clang/lib/Frontend')
-rw-r--r--clang/lib/Frontend/InitHeaderSearch.cpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/clang/lib/Frontend/InitHeaderSearch.cpp b/clang/lib/Frontend/InitHeaderSearch.cpp
index f378fc2f533..f595fb1585f 100644
--- a/clang/lib/Frontend/InitHeaderSearch.cpp
+++ b/clang/lib/Frontend/InitHeaderSearch.cpp
@@ -103,6 +103,14 @@ public:
} // end anonymous namespace.
+static bool CanPrefixSysroot(StringRef Path) {
+#if defined(_WIN32)
+ return !Path.empty() && llvm::sys::path::is_separator(Path[0]);
+#else
+ return llvm::sys::path::is_absolute(Path);
+#endif
+}
+
void InitHeaderSearch::AddPath(const Twine &Path,
IncludeDirGroup Group, bool isCXXAware,
bool isFramework, bool IgnoreSysRoot) {
@@ -115,16 +123,9 @@ void InitHeaderSearch::AddPath(const 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) {
+ CanPrefixSysroot(MappedPathStr) && IsNotEmptyOrRoot) {
MappedPathStorage.clear();
- MappedPathStr =
- (IncludeSysroot + Path).toStringRef(MappedPathStorage);
+ MappedPathStr = (IncludeSysroot + Path).toStringRef(MappedPathStorage);
}
// Compute the DirectoryLookup type.
OpenPOWER on IntegriCloud