commit c535d9730e11ca335790359bfbd4600be71c5410
author Benjamin Kramer <benny.kra@googlemail.com> Fri Sep 23 02:25:14 2011 +0000
committer Benjamin Kramer <benny.kra@googlemail.com> Fri Sep 23 02:25:14 2011 +0000
tree 1e284adc9d6940425da9b4c66a4401206daf82f1
parent d01fb36600642d2539b6a97bf2ae308cc44a9f46

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

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@140365 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Frontend/InitHeaderSearch.cpp

diff --git a/lib/Frontend/InitHeaderSearch.cpp b/lib/Frontend/InitHeaderSearch.cpp
index 089ded1..4506774 100644
--- a/lib/Frontend/InitHeaderSearch.cpp
+++ b/lib/Frontend/InitHeaderSearch.cpp
@@ -1072,7 +1072,7 @@
        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);

test/Driver/cpath.c

diff --git a/test/Driver/cpath.c b/test/Driver/cpath.c
index 559d019..c497c4d 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