diff options
| author | William Boman <william@redwill.se> | 2022-02-10 10:25:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-10 10:25:09 +0100 |
| commit | 5000f77c4bbe753ba1b03e465e57cd48da8f5989 (patch) | |
| tree | d8a8b8cec6367b91fbcca91469d1bbb738263e69 /lua | |
| parent | run autogen_metadata.lua (diff) | |
| download | mason-5000f77c4bbe753ba1b03e465e57cd48da8f5989.tar mason-5000f77c4bbe753ba1b03e465e57cd48da8f5989.tar.gz mason-5000f77c4bbe753ba1b03e465e57cd48da8f5989.tar.bz2 mason-5000f77c4bbe753ba1b03e465e57cd48da8f5989.tar.lz mason-5000f77c4bbe753ba1b03e465e57cd48da8f5989.tar.xz mason-5000f77c4bbe753ba1b03e465e57cd48da8f5989.tar.zst mason-5000f77c4bbe753ba1b03e465e57cd48da8f5989.zip | |
fix(ccls/macos): append /lib/cmake to CMAKE_PREFIX_PATH (#471)
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/nvim-lsp-installer/servers/ccls/init.lua | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lua/nvim-lsp-installer/servers/ccls/init.lua b/lua/nvim-lsp-installer/servers/ccls/init.lua index bf6bcaa0..5482af87 100644 --- a/lua/nvim-lsp-installer/servers/ccls/init.lua +++ b/lua/nvim-lsp-installer/servers/ccls/init.lua @@ -131,7 +131,10 @@ return function(name, root_dir) "-Wno-dev", ("-DCMAKE_INSTALL_PREFIX=%s"):format(ctx.install_dir), when(not ctx.use_system_llvm, ("-DCMAKE_PREFIX_PATH=%s"):format(ctx.llvm_dir)), - when(not ctx.use_system_llvm, ("-DCLANG_RESOURCE_DIR=%s"):format(clang_resource_dir)), + when( + not platform.is_mac and not ctx.use_system_llvm, + ("-DCLANG_RESOURCE_DIR=%s"):format(clang_resource_dir) + ), when(platform.is_mac, "-DCMAKE_OSX_SYSROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk") ) ) @@ -153,7 +156,7 @@ return function(name, root_dir) local mac_ccls_installer = installers.pipe { context.use_homebrew_prefix(), context.set(function(ctx) - ctx.llvm_dir = path.concat { ctx.homebrew_prefix, "opt", "llvm" } + ctx.llvm_dir = path.concat { ctx.homebrew_prefix, "opt", "llvm", "lib", "cmake" } end), function(_, callback, ctx) if not fs.dir_exists(ctx.llvm_dir) then |