diff options
| -rw-r--r-- | lib/Frontend/InitHeaderSearch.cpp | 2 | ||||
| -rw-r--r-- | test/Driver/cpath.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Frontend/InitHeaderSearch.cpp b/lib/Frontend/InitHeaderSearch.cpp index 089ded19ce..450677463a 100644 --- a/lib/Frontend/InitHeaderSearch.cpp +++ b/lib/Frontend/InitHeaderSearch.cpp @@ -1072,7 +1072,7 @@ void InitHeaderSearch::Realize(const LangOptions &Lang) { it != ie; ++it) { if (it->first == System || (!Lang.ObjC1 && !Lang.CPlusPlus && it->first == CSystem) || - (!Lang.ObjC1 && Lang.CPlusPlus && it->first == CXXSystem) || + (/*FIXME !Lang.ObjC1 && */Lang.CPlusPlus && it->first == CXXSystem) || (Lang.ObjC1 && !Lang.CPlusPlus && it->first == ObjCSystem) || (Lang.ObjC1 && Lang.CPlusPlus && it->first == ObjCXXSystem)) SearchList.push_back(it->second); diff --git a/test/Driver/cpath.c b/test/Driver/cpath.c index 559d019080..c497c4daf3 100644 --- a/test/Driver/cpath.c +++ b/test/Driver/cpath.c @@ -12,8 +12,8 @@ // C_INCLUDE_PATH: test2 // C_INCLUDE_PATH-NOT: test1 -// RUN: env OBJC_INCLUDE_PATH=%T/test1 OBJCPLUS_INCLUDE_PATH=%T/test2 CPLUS_INCLUDE_PATH=%T/test1 C_INCLUDE_PATH=%T/test1 %clang -x objective-c++ -E -v %s 2>&1 | FileCheck %s -check-prefix=OBJCPLUS_INCLUDE_PATH -// OBJCPLUS_INCLUDE_PATH: -c-isystem {{.*}}/test1 -cxx-isystem {{.*}}/test1 -objc-isystem {{.*}}/test1 -objcxx-isystem {{.*}}/test2 +// RUN: env OBJC_INCLUDE_PATH=%T/test1 OBJCPLUS_INCLUDE_PATH=%T/test2 CPLUS_INCLUDE_PATH=%T/test2 C_INCLUDE_PATH=%T/test1 %clang -x objective-c++ -E -v %s 2>&1 | FileCheck %s -check-prefix=OBJCPLUS_INCLUDE_PATH +// OBJCPLUS_INCLUDE_PATH: -c-isystem {{.*}}/test1 -cxx-isystem {{.*}}/test2 -objc-isystem {{.*}}/test1 -objcxx-isystem {{.*}}/test2 // OBJCPLUS_INCLUDE_PATH: search starts here // OBJCPLUS_INCLUDE_PATH-NOT: test1 // OBJCPLUS_INCLUDE_PATH: test2 |