#711 - Make the gcc executables configurable

2 files changed, 18 insertions, 25 deletions

diff --git a/ale_linters/c/gcc.vim b/ale_linters/c/gcc.vim
index c988b30f..4b241e37 100644
--- a/ale_linters/c/gcc.vim
+++ b/ale_linters/c/gcc.vim
@@ -1,20 +1,20 @@
 " Author: w0rp <devw0rp@gmail.com>
 " Description: gcc linter for c files
 
-" Set this option to change the GCC options for warnings for C.
-if !exists('g:ale_c_gcc_options')
-    " let g:ale_c_gcc_options = '-Wall'
-    " let g:ale_c_gcc_options = '-std=c99 -Wall'
-    " c11 compatible
-    let g:ale_c_gcc_options = '-std=c11 -Wall'
-endif
+call ale#Set('c_gcc_executable', 'gcc')
+call ale#Set('c_gcc_options', '-std=c11 -Wall')
+
+function! ale_linters#c#gcc#GetExecutable(buffer) abort
+    return ale#Var(a:buffer, 'c_gcc_executable')
+endfunction
 
 function! ale_linters#c#gcc#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 'gcc -S -x c -fsyntax-only '
+    return ale#Escape(ale_linters#c#gcc#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_gcc_options') . ' -'
@@ -23,7 +23,7 @@ endfunction
 call ale#linter#Define('c', {
 \   'name': 'gcc',
 \   'output_stream': 'stderr',
-\   'executable': 'gcc',
+\   'executable_callback': 'ale_linters#c#gcc#GetExecutable',
 \   'command_callback': 'ale_linters#c#gcc#GetCommand',
 \   'callback': 'ale#handlers#gcc#HandleGCCFormat',
 \})
diff --git a/ale_linters/cpp/gcc.vim b/ale_linters/cpp/gcc.vim
index 69b69e4f..40dffc98 100644
--- a/ale_linters/cpp/gcc.vim
+++ b/ale_linters/cpp/gcc.vim
@@ -1,27 +1,20 @@
 " Author: geam <mdelage@student.42.fr>
 " Description: gcc linter for cpp files
+"
+call ale#Set('cpp_gcc_executable', 'gcc')
+call ale#Set('cpp_gcc_options', '-std=c++14 -Wall')
 
-" Set this option to change the GCC options for warnings for C.
-if !exists('g:ale_cpp_gcc_options')
-    let s:version = ale#handlers#gcc#ParseGCCVersion(systemlist('gcc --version'))
-
-    if !empty(s:version) && ale#semver#GreaterOrEqual(s:version, [4, 9, 0])
-        " Use c++14 support in 4.9 and above.
-        let g:ale_cpp_gcc_options = '-std=c++14 -Wall'
-    else
-        " Use c++1y in older versions.
-        let g:ale_cpp_gcc_options = '-std=c++1y -Wall'
-    endif
-
-    unlet! s:version
-endif
+function! ale_linters#cpp#gcc#GetExecutable(buffer) abort
+    return ale#Var(a:buffer, 'cpp_gcc_executable')
+endfunction
 
 function! ale_linters#cpp#gcc#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 'gcc -S -x c++ -fsyntax-only '
+    return ale#Escape(ale_linters#cpp#gcc#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_gcc_options') . ' -'
@@ -30,7 +23,7 @@ endfunction
 call ale#linter#Define('cpp', {
 \   'name': 'g++',
 \   'output_stream': 'stderr',
-\   'executable': 'g++',
+\   'executable_callback': 'ale_linters#cpp#gcc#GetExecutable',
 \   'command_callback': 'ale_linters#cpp#gcc#GetCommand',
 \   'callback': 'ale#handlers#gcc#HandleGCCFormat',
 \})