From 818dd8666a5728d4bcdef39596f9f3bc692b0750 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Thu, 13 Jun 2019 09:42:43 +0000 Subject: [WebAssembly] Modernize include path handling Move include path construction from InitHeaderSearch::AddDefaultIncludePaths in the Driver which appears to be the more modern/correct way of doing things. Differential Revision: https://reviews.llvm.org/D63030 llvm-svn: 363241 --- clang/lib/Frontend/InitHeaderSearch.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'clang/lib/Frontend') diff --git a/clang/lib/Frontend/InitHeaderSearch.cpp b/clang/lib/Frontend/InitHeaderSearch.cpp index e6cd8235b01..d65d13489dc 100644 --- a/clang/lib/Frontend/InitHeaderSearch.cpp +++ b/clang/lib/Frontend/InitHeaderSearch.cpp @@ -414,9 +414,11 @@ void InitHeaderSearch::AddDefaultIncludePaths(const LangOptions &Lang, default: break; // Everything else continues to use this routine's logic. + case llvm::Triple::Emscripten: case llvm::Triple::Linux: case llvm::Triple::Hurd: case llvm::Triple::Solaris: + case llvm::Triple::WASI: return; case llvm::Triple::Win32: @@ -424,6 +426,12 @@ void InitHeaderSearch::AddDefaultIncludePaths(const LangOptions &Lang, triple.isOSBinFormatMachO()) return; break; + + case llvm::Triple::UnknownOS: + if (triple.getArch() == llvm::Triple::wasm32 || + triple.getArch() == llvm::Triple::wasm64) + return; + break; } // All header search logic is handled in the Driver for Darwin. -- cgit v1.2.3