Author: d0k
Date: Thu Sep 22 21:25:14 2011
New Revision: 140365
URL: http://llvm.org/viewvc/llvm-project?rev=140365&view=rev
Log:
Reenable -cxx-isystem for Objective C++, until I come up with a better solution
Modified:
cfe/trunk/lib/Frontend/InitHeaderSearch.cpp
cfe/trunk/test/Driver/cpath.c
Modified: cfe/trunk/lib/Frontend/InitHeaderSearch.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitHeaderSearch.cpp?rev=140365&r1=140364&r2=140365&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/InitHeaderSearch.cpp (original)
+++ cfe/trunk/lib/Frontend/InitHeaderSearch.cpp Thu Sep 22 21:25:14 2011
@@ -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);
Modified: cfe/trunk/test/Driver/cpath.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/cpath.c?rev=140365&r1=140364&r2=140365&view=diff
==============================================================================
--- cfe/trunk/test/Driver/cpath.c (original)
+++ cfe/trunk/test/Driver/cpath.c Thu Sep 22 21:25:14 2011
@@ -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
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
