attempt to use command line tools stdc++ include path on mac

akroshko · Nov 10, 2023 · 8de9024 · 8de9024
1 parent ee1ab7b
commit 8de9024
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/src/Server.cpp b/src/Server.cpp
@@ -74,18 +74,6 @@
 #endif
 
 
-// Absolute paths to search (under) for (clang) system include files
-// Iterate until we find a dir at <abspath>/clang/<version>/include.
-// As of clang 4.0.0 we don't need (and can't have) these includes on Mac.
-#if CINDEX_VERSION_ENCODE(CINDEX_VERSION_MAJOR, CINDEX_VERSION_MINOR) >= CINDEX_VERSION_ENCODE(0, 37) && defined(OS_Darwin)
-static const List<Path> sSystemIncludePaths;
-#else
-static const List<Path> sSystemIncludePaths = {
-    CLANG_LIBDIR_STR, // standard llvm build, debian/ubuntu
-    "/usr/lib"        // fedora, arch
-};
-#endif
-
 Server *Server::sInstance = nullptr;
 Server::Server()
     : mSuspended(false), mEnvironment(Rct::environment()), mPollTimer(-1), mExitCode(0),
@@ -165,14 +153,28 @@ bool Server::init(const Options &options)
 
     if (!(mOptions.options & NoLibClangIncludePath)) {
         // Iterate until we find an existing directory
-        for (Path systemInclude : sSystemIncludePaths) {
+        // Absolute paths to search (under) for (clang) system include files
+        // Iterate until we find a dir at <abspath>/clang/<version>/include.
+        // As of clang 4.0.0 we don't need (and can't have) these includes on Mac.
+#if CINDEX_VERSION_ENCODE(CINDEX_VERSION_MAJOR, CINDEX_VERSION_MINOR) >= CINDEX_VERSION_ENCODE(0, 37) && defined(OS_Darwin)
+        const Path commandLineToolsPath = "/Library/Developer/CommandLineTools/usr/include/c++/v1/";
+        if (commandLineToolsPath.isDir()) {
+            mOptions.includePaths.push_back(Source::Include(Source::Include::Type_System, commandLineToolsPath));
+        }
+#else
+        const List<Path> systemIncludePaths = {
+            CLANG_LIBDIR_STR, // standard llvm build, debian/ubuntu
+            "/usr/lib"        // fedora, arch
+        };
+        for (Path systemInclude : systemIncludePaths) {
             systemInclude = systemInclude.ensureTrailingSlash();
             systemInclude << "clang/" << CLANG_VERSION_STRING << "/include/";
             if (systemInclude.isDir()) {
                 mOptions.includePaths.push_back(Source::Include(Source::Include::Type_System, systemInclude));
                 break;
             }
         }
+#endif
     }
 
     if (!initServers()) {