maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Reenable -cxx-isystem for Objective C++, until I come up with a better solution 

llvm-svn: 140365
This commit is contained in:
Benjamin Kramer 2011-09-23 02:25:14 +00:00
parent 7d7d1afeb7
commit 559865c89d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Frontend/InitHeaderSearch.cpp
View File

@ -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);

4
clang/test/Driver/cpath.c
View File

@ -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