From d7ae18e1d88a90c57dc72ca6515ff0ce106dcd12 Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Tue, 1 Oct 2019 16:01:11 +0000 Subject: [PATCH] Fix build with EXTRAS disabled. clangd is part of EXTRAS, not CLANG. PR: 240826 Reported by: rozhuk.im@gmail.com --- devel/llvm90/Makefile.COMMANDS | 2 +- devel/llvm90/pkg-plist | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devel/llvm90/Makefile.COMMANDS b/devel/llvm90/Makefile.COMMANDS index c52fc7d5e0de..f17ac9d7aae3 100644 --- a/devel/llvm90/Makefile.COMMANDS +++ b/devel/llvm90/Makefile.COMMANDS @@ -63,13 +63,13 @@ CLANG_COMMANDS= \ clang-import-test \ clang-offload-bundler \ clang-scan-deps \ - clangd \ diagtool \ hmaptool \ scan-build \ scan-view EXTRAS_COMMANDS= \ + clangd \ clang-apply-replacements \ clang-change-namespace \ clang-doc \ diff --git a/devel/llvm90/pkg-plist b/devel/llvm90/pkg-plist index 3bdfdd758bb9..92a707982f22 100644 --- a/devel/llvm90/pkg-plist +++ b/devel/llvm90/pkg-plist @@ -60,11 +60,11 @@ bin/sancov%%LLVM_SUFFIX%% %%CLANG%%bin/clang-import-test%%LLVM_SUFFIX%% %%CLANG%%bin/clang-offload-bundler%%LLVM_SUFFIX%% %%CLANG%%bin/clang-scan-deps%%LLVM_SUFFIX%% -%%CLANG%%bin/clangd%%LLVM_SUFFIX%% %%CLANG%%bin/diagtool%%LLVM_SUFFIX%% %%CLANG%%bin/hmaptool%%LLVM_SUFFIX%% %%CLANG%%bin/scan-build%%LLVM_SUFFIX%% %%CLANG%%bin/scan-view%%LLVM_SUFFIX%% +%%EXTRAS%%bin/clangd%%LLVM_SUFFIX%% %%EXTRAS%%bin/clang-apply-replacements%%LLVM_SUFFIX%% %%EXTRAS%%bin/clang-change-namespace%%LLVM_SUFFIX%% %%EXTRAS%%bin/clang-doc%%LLVM_SUFFIX%% @@ -135,7 +135,7 @@ llvm%%LLVM_SUFFIX%%/bin/bugpoint %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-scan-deps %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-tblgen %%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/clang-tidy -%%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clangd +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/clangd %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/diagtool llvm%%LLVM_SUFFIX%%/bin/dsymutil %%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/find-all-symbols