commit 0e2c34f92f00628d48968dfea096d36381f494cb
author Stephen Hines <srhines@google.com> Mon Mar 23 12:09:02 2015 -0700
committer Stephen Hines <srhines@google.com> Tue Mar 31 17:07:53 2015 -0700
tree 03a142fc9174f13e1e3120853592c56778f14fe5
parent f6595cb19f570efe109abe570c726ebd7afd3973

Update aosp/master clang for rebase to r230699.

Change-Id: I6a546ab3d4ae37119eebb735e102cca4f80ab520

lib/Frontend/InitHeaderSearch.cpp

diff --git a/lib/Frontend/InitHeaderSearch.cpp b/lib/Frontend/InitHeaderSearch.cpp
index 5e89c8c..a518a0a 100644
--- a/lib/Frontend/InitHeaderSearch.cpp
+++ b/lib/Frontend/InitHeaderSearch.cpp
@@ -467,7 +467,7 @@
   case llvm::Triple::Win32:
     if (triple.getEnvironment() == llvm::Triple::MSVC ||
         triple.getEnvironment() == llvm::Triple::Itanium ||
-        triple.getObjectFormat() == llvm::Triple::MachO)
+        triple.isOSBinFormatMachO())
       return;
     break;
   }