summaryrefslogtreecommitdiffstats
path: root/clang/lib/Frontend/InitHeaderSearch.cpp
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2011-05-24 04:31:14 +0000
committerNico Weber <nicolasweber@gmx.de>2011-05-24 04:31:14 +0000
commit3b1d1217f827c52a71786202968929e4017bc80f (patch)
treea66866d5c68ff4fa31749a051e4db6d10f433046 /clang/lib/Frontend/InitHeaderSearch.cpp
parent0130027dec1d48f2a454dee0f9bfb5b49a036b1c (diff)
downloadbcm5719-llvm-3b1d1217f827c52a71786202968929e4017bc80f.tar.gz
bcm5719-llvm-3b1d1217f827c52a71786202968929e4017bc80f.zip
Make it possible for external tools to distinguish between paths that come from -I and paths that come from -system. Patch from Paul Holden!
llvm-svn: 131955
Diffstat (limited to 'clang/lib/Frontend/InitHeaderSearch.cpp')
-rw-r--r--clang/lib/Frontend/InitHeaderSearch.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Frontend/InitHeaderSearch.cpp b/clang/lib/Frontend/InitHeaderSearch.cpp
index 4e0d4c1b435..9bdb13a944b 100644
--- a/clang/lib/Frontend/InitHeaderSearch.cpp
+++ b/clang/lib/Frontend/InitHeaderSearch.cpp
@@ -1008,6 +1008,8 @@ void InitHeaderSearch::Realize(const LangOptions &Lang) {
if (it->first == Angled)
SearchList.push_back(it->second);
}
+ RemoveDuplicates(SearchList, quoted, Verbose);
+ unsigned angled = SearchList.size();
for (path_iterator it = IncludePath.begin(), ie = IncludePath.end();
it != ie; ++it) {
@@ -1021,10 +1023,10 @@ void InitHeaderSearch::Realize(const LangOptions &Lang) {
SearchList.push_back(it->second);
}
- RemoveDuplicates(SearchList, quoted, Verbose);
+ RemoveDuplicates(SearchList, angled, Verbose);
bool DontSearchCurDir = false; // TODO: set to true if -I- is set?
- Headers.SetSearchPaths(SearchList, quoted, DontSearchCurDir);
+ Headers.SetSearchPaths(SearchList, quoted, angled, DontSearchCurDir);
// If verbose, print the list of directories that will be searched.
if (Verbose) {
OpenPOWER on IntegriCloud