commit 07216a1161173c0c3f81544459eb4feae808bf8c
author Bob Wilson <bob.wilson@apple.com> Tue Jun 10 21:07:12 2014 +0000
committer Bob Wilson <bob.wilson@apple.com> Tue Jun 10 21:07:12 2014 +0000
tree ae7a7f8e469377f6f23dddb4877d2378b705d9be
parent 73429fd4a69504bb6fb4bbfc550f649eb102099a

Fix crash with x86_64-pc-win32-macho target. <rdar://problem/17235840>

The changes in r204978 broke win32-macho targets. There were checks added for
MSVC and Itanium environments as special cases, and win32-macho needs to be
treated the same way.

llvm-svn: 210584

clang/lib/Frontend/InitHeaderSearch.cpp

diff --git a/clang/lib/Frontend/InitHeaderSearch.cpp b/clang/lib/Frontend/InitHeaderSearch.cpp
index d2890f0..d2edc94 100644
--- a/clang/lib/Frontend/InitHeaderSearch.cpp
+++ b/clang/lib/Frontend/InitHeaderSearch.cpp
@@ -472,7 +472,8 @@
 
   case llvm::Triple::Win32:
     if (triple.getEnvironment() == llvm::Triple::MSVC ||
-        triple.getEnvironment() == llvm::Triple::Itanium)
+        triple.getEnvironment() == llvm::Triple::Itanium ||
+        triple.getObjectFormat() == llvm::Triple::MachO)
       return;
     break;
   }