summaryrefslogtreecommitdiffstats
path: root/clang/lib/Frontend/InitHeaderSearch.cpp
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2013-01-29 23:59:43 +0000
committerDaniel Dunbar <daniel@zuster.org>2013-01-29 23:59:43 +0000
commit335a37b7e04e17d8e0b0059f5d95fb4f4b181926 (patch)
tree03902ddeb6c3ef12d071ea2949e3b38128df8c4c /clang/lib/Frontend/InitHeaderSearch.cpp
parent2e8eb01a71841d4cefe589aaa7948ddd437925ea (diff)
downloadbcm5719-llvm-335a37b7e04e17d8e0b0059f5d95fb4f4b181926.tar.gz
bcm5719-llvm-335a37b7e04e17d8e0b0059f5d95fb4f4b181926.zip
[Frontend] Rename a member variable to clarify its intent.
llvm-svn: 173854
Diffstat (limited to 'clang/lib/Frontend/InitHeaderSearch.cpp')
-rw-r--r--clang/lib/Frontend/InitHeaderSearch.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/clang/lib/Frontend/InitHeaderSearch.cpp b/clang/lib/Frontend/InitHeaderSearch.cpp
index f595fb1585f..d23c988e827 100644
--- a/clang/lib/Frontend/InitHeaderSearch.cpp
+++ b/clang/lib/Frontend/InitHeaderSearch.cpp
@@ -43,13 +43,13 @@ class InitHeaderSearch {
HeaderSearch &Headers;
bool Verbose;
std::string IncludeSysroot;
- bool IsNotEmptyOrRoot;
+ bool HasSysroot;
public:
InitHeaderSearch(HeaderSearch &HS, bool verbose, StringRef sysroot)
: Headers(HS), Verbose(verbose), IncludeSysroot(sysroot),
- IsNotEmptyOrRoot(!(sysroot.empty() || sysroot == "/")) {
+ HasSysroot(!(sysroot.empty() || sysroot == "/")) {
}
/// AddPath - Add the specified path to the specified group list.
@@ -121,9 +121,10 @@ void InitHeaderSearch::AddPath(const Twine &Path,
SmallString<256> MappedPathStorage;
StringRef MappedPathStr = Path.toStringRef(MappedPathStorage);
- // Handle isysroot.
- if ((Group == System || Group == CXXSystem) && !IgnoreSysRoot &&
- CanPrefixSysroot(MappedPathStr) && IsNotEmptyOrRoot) {
+ // Prepend the sysroot, if desired and this is a system header group.
+ if (HasSysroot && !IgnoreSysRoot &&
+ (Group == System || Group == CXXSystem) &&
+ CanPrefixSysroot(MappedPathStr)) {
MappedPathStorage.clear();
MappedPathStr = (IncludeSysroot + Path).toStringRef(MappedPathStorage);
}
OpenPOWER on IntegriCloud