r193893 - Preload module maps in normal user directories, too.

Douglas Gregor dgregor at apple.com
Fri Nov 1 16:08:38 PDT 2013


Author: dgregor
Date: Fri Nov  1 18:08:38 2013
New Revision: 193893

URL: http://llvm.org/viewvc/llvm-project?rev=193893&view=rev
Log:
Preload module maps in normal user directories, too.

... in case someone decides to -I/usr/include <rdar://problem/15235948>.

Modified:
    cfe/trunk/lib/Lex/HeaderSearch.cpp

Modified: cfe/trunk/lib/Lex/HeaderSearch.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/HeaderSearch.cpp?rev=193893&r1=193892&r2=193893&view=diff
==============================================================================
--- cfe/trunk/lib/Lex/HeaderSearch.cpp (original)
+++ cfe/trunk/lib/Lex/HeaderSearch.cpp Fri Nov  1 18:08:38 2013
@@ -1173,9 +1173,8 @@ void HeaderSearch::collectAllModules(Sma
 void HeaderSearch::loadTopLevelSystemModules() {
   // Load module maps for each of the header search directories.
   for (unsigned Idx = 0, N = SearchDirs.size(); Idx != N; ++Idx) {
-    // We only care about normal system header directories.
-    if (!SearchDirs[Idx].isNormalDir() ||
-        SearchDirs[Idx].getDirCharacteristic() != SrcMgr::C_System) {
+    // We only care about normal header directories.
+    if (!SearchDirs[Idx].isNormalDir()) {
       continue;
     }
 





More information about the cfe-commits mailing list