From 61060928919ca517d6fb9db75bc6fb04613ba9d3 Mon Sep 17 00:00:00 2001 From: eidheim Date: Tue, 26 Mar 2019 10:43:47 +0100 Subject: [PATCH] MacOS: Added missing system include folder for llvm 8.0.0 --- src/compile_commands.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/compile_commands.cc b/src/compile_commands.cc index 23bd3e6..ba6942c 100644 --- a/src/compile_commands.cc +++ b/src/compile_commands.cc @@ -141,11 +141,15 @@ std::vector CompileCommands::get_arguments(const boost::filesystem: if(std::regex_match(clang_version_string, sm, clang_version_regex)) { auto clang_version = sm[1].str(); arguments.emplace_back("-I/usr/lib/clang/" + clang_version + "/include"); - arguments.emplace_back("-I/usr/lib64/clang/" + clang_version + "/include"); // For Fedora -#if defined(__APPLE__) && CINDEX_VERSION_MAJOR == 0 && CINDEX_VERSION_MINOR < 32 // TODO: remove during 2018 if llvm3.7 is no longer in homebrew (CINDEX_VERSION_MINOR=32 equals clang-3.8 I think) + arguments.emplace_back("-I/usr/lib64/clang/" + clang_version + "/include"); // For Fedora +#if defined(__APPLE__) +#if CINDEX_VERSION_MAJOR == 0 && CINDEX_VERSION_MINOR < 32 // TODO: remove during 2018 if llvm3.7 is no longer in homebrew (CINDEX_VERSION_MINOR=32 equals clang-3.8 I think) arguments.emplace_back("-I/usr/local/Cellar/llvm/" + clang_version + "/lib/clang/" + clang_version + "/include"); - arguments.emplace_back("-I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1"); + arguments.emplace_back("-I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1"); arguments.emplace_back("-I/Library/Developer/CommandLineTools/usr/bin/../include/c++/v1"); //Added for OS X 10.11 +#else + arguments.emplace_back("-I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1"); // Missing include folder in llvm 8.0.0 +#endif #endif #ifdef _WIN32 auto env_msystem_prefix = std::getenv("MSYSTEM_PREFIX");