1 files changed, 10 insertions, 5 deletions
diff --git a/clang/Driver/clang.cpp b/clang/Driver/clang.cpp
index 08299b16ae8..82247432118 100644
--- a/clang/Driver/clang.cpp
+++ b/clang/Driver/clang.cpp
@@ -848,11 +848,16 @@ static void InitializeIncludePaths(HeaderSearch &Headers, FileManager &FM,
     for (unsigned i = 0, e = SearchList.size(); i != e; ++i) {
       if (i == QuotedIdx)
         fprintf(stderr, "#include <...> search starts here:\n");
-      fprintf(stderr, " %s", SearchList[i].getDir()->getName());
-      if (SearchList[i].isFramework())
-        fprintf(stderr, " (framework directory)");
-      // FIXME: Print (headermap)"
-      fprintf(stderr, "\n");
+      if (SearchList[i].isNormalDir())
+        fprintf(stderr, " %s\n", SearchList[i].getDir()->getName());
+      else if (SearchList[i].isFramework())
+        fprintf(stderr, " %s (framework directory)\n",
+                SearchList[i].getFrameworkDir()->getName());
+      else {
+        assert(SearchList[i].isHeaderMap() && "Unknown DirectoryLookup");
+        //fprintf(stderr, " %s (headermap)\n",
+        //        SearchList[i].getHeaderMap()->getName());
+      }
     }
     fprintf(stderr, "End of search list.\n");
   }