From: Bob Wilson Date: Tue, 10 Jun 2014 21:07:12 +0000 (+0000) Subject: Fix crash with x86_64-pc-win32-macho target. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38193396ad17b7d7a27df4c4c31fcdc49592ede8;p=clang Fix crash with x86_64-pc-win32-macho target. 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. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@210584 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Frontend/InitHeaderSearch.cpp b/lib/Frontend/InitHeaderSearch.cpp index d2890f0857..d2edc9479f 100644 --- a/lib/Frontend/InitHeaderSearch.cpp +++ b/lib/Frontend/InitHeaderSearch.cpp @@ -472,7 +472,8 @@ void InitHeaderSearch::AddDefaultIncludePaths(const LangOptions &Lang, 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; } diff --git a/test/Misc/win32-macho.c b/test/Misc/win32-macho.c new file mode 100644 index 0000000000..2879ba4479 --- /dev/null +++ b/test/Misc/win32-macho.c @@ -0,0 +1,2 @@ +// Check that basic use of win32-macho targets works. +// RUN: %clang -c -target x86_64-pc-win32-macho %s