diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2011-09-23 02:25:14 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2011-09-23 02:25:14 +0000 |
| commit | 559865c89dcb9d4aff73828b9d89cc34a6c59229 (patch) | |
| tree | 4271bc6eea0f5b2236e78dcad87cf8f3d2c68687 /clang | |
| parent | 7d7d1afeb7177434a2f16af6a3355cf95ed360e4 (diff) | |
| download | bcm5719-llvm-559865c89dcb9d4aff73828b9d89cc34a6c59229.tar.gz bcm5719-llvm-559865c89dcb9d4aff73828b9d89cc34a6c59229.zip | |
Reenable -cxx-isystem for Objective C++, until I come up with a better solution
llvm-svn: 140365
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Frontend/InitHeaderSearch.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Driver/cpath.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Frontend/InitHeaderSearch.cpp b/clang/lib/Frontend/InitHeaderSearch.cpp index 089ded19cef..450677463aa 100644 --- a/clang/lib/Frontend/InitHeaderSearch.cpp +++ b/clang/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/clang/test/Driver/cpath.c b/clang/test/Driver/cpath.c index 559d019080c..c497c4daf3a 100644 --- a/clang/test/Driver/cpath.c +++ b/clang/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 |
