#711 - Make the clang executables configurable

2 files changed, 18 insertions, 15 deletions

diff --git a/ale_linters/c/clang.vim b/ale_linters/c/clang.vim
index 2cecc514..6ad5f122 100644
--- a/ale_linters/c/clang.vim
+++ b/ale_linters/c/clang.vim
@@ -1,20 +1,20 @@
 " Author: Masahiro H https://github.com/mshr-h
 " Description: clang linter for c files
 
-" Set this option to change the Clang options for warnings for C.
-if !exists('g:ale_c_clang_options')
-    " let g:ale_c_clang_options = '-Wall'
-    " let g:ale_c_clang_options = '-std=c99 -Wall'
-    " c11 compatible
-    let g:ale_c_clang_options = '-std=c11 -Wall'
-endif
+call ale#Set('c_clang_executable', 'clang')
+call ale#Set('c_clang_options', '-std=c11 -Wall')
+
+function! ale_linters#c#clang#GetExecutable(buffer) abort
+    return ale#Var(a:buffer, 'c_clang_executable')
+endfunction
 
 function! ale_linters#c#clang#GetCommand(buffer) abort
     let l:paths = ale#c#FindLocalHeaderPaths(a:buffer)
 
     " -iquote with the directory the file is in makes #include work for
     "  headers in the same directory.
-    return 'clang -S -x c -fsyntax-only '
+    return ale#Escape(ale_linters#c#clang#GetExecutable(a:buffer))
+    \   . ' -S -x c -fsyntax-only '
     \   . '-iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h')) . ' '
     \   . ale#c#IncludeOptions(l:paths)
     \   . ale#Var(a:buffer, 'c_clang_options') . ' -'
@@ -23,7 +23,7 @@ endfunction
 call ale#linter#Define('c', {
 \   'name': 'clang',
 \   'output_stream': 'stderr',
-\   'executable': 'clang',
+\   'executable_callback': 'ale_linters#c#clang#GetCommand',
 \   'command_callback': 'ale_linters#c#clang#GetCommand',
 \   'callback': 'ale#handlers#gcc#HandleGCCFormat',
 \})
diff --git a/ale_linters/cpp/clang.vim b/ale_linters/cpp/clang.vim
index f70101d3..80f1d941 100644
--- a/ale_linters/cpp/clang.vim
+++ b/ale_linters/cpp/clang.vim
@@ -1,17 +1,20 @@
 " Author: Tomota Nakamura <https://github.com/tomotanakamura>
 " Description: clang linter for cpp files
 
-" Set this option to change the Clang options for warnings for CPP.
-if !exists('g:ale_cpp_clang_options')
-    let g:ale_cpp_clang_options = '-std=c++14 -Wall'
-endif
+call ale#Set('cpp_clang_executable', 'clang++')
+call ale#Set('cpp_clang_options', '-std=c++14 -Wall')
+
+function! ale_linters#cpp#clang#GetExecutable(buffer) abort
+    return ale#Var(a:buffer, 'cpp_clang_executable')
+endfunction
 
 function! ale_linters#cpp#clang#GetCommand(buffer) abort
     let l:paths = ale#c#FindLocalHeaderPaths(a:buffer)
 
     " -iquote with the directory the file is in makes #include work for
     "  headers in the same directory.
-    return 'clang++ -S -x c++ -fsyntax-only '
+    return ale#Escape(ale_linters#cpp#clang#GetExecutable(a:buffer))
+    \   . ' -S -x c++ -fsyntax-only '
     \   . '-iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h')) . ' '
     \   . ale#c#IncludeOptions(l:paths)
     \   . ale#Var(a:buffer, 'cpp_clang_options') . ' -'
@@ -20,7 +23,7 @@ endfunction
 call ale#linter#Define('cpp', {
 \   'name': 'clang',
 \   'output_stream': 'stderr',
-\   'executable': 'clang++',
+\   'executable_callback': 'ale_linters#cpp#clang#GetCommand',
 \   'command_callback': 'ale_linters#cpp#clang#GetCommand',
 \   'callback': 'ale#handlers#gcc#HandleGCCFormat',
 \})