From 42ea3426d1a189ea33482b3bf5f1955857775bb3 Mon Sep 17 00:00:00 2001
From: Martin Grenfell <martin.grenfell@gmail.com>
Date: Fri, 13 Jan 2012 15:41:34 +0000
Subject: [PATCH] cuda: simplify/fix the executable checking

Remove the g:syntastic_nvcc_binary option as this should be in the users
path - or at least symlinked in. Also, the logic was broken in that the
script was hardcoded to only accept '/usr/local/cuda/bin/nvcc' as the
binary anyway.
---
 syntax_checkers/cuda.vim | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/syntax_checkers/cuda.vim b/syntax_checkers/cuda.vim
index 02666543..816505eb 100644
--- a/syntax_checkers/cuda.vim
+++ b/syntax_checkers/cuda.vim
@@ -16,21 +16,18 @@ if exists('loaded_cuda_syntax_checker')
 endif
 let loaded_cuda_syntax_checker = 1
 
-if !exists('g:syntastic_nvcc_binary')
-	let g:syntastic_nvcc_binary = '/usr/local/cuda/bin/nvcc'
-endif
-if !executable('/usr/local/cuda/bin/nvcc')
+if !executable('nvcc')
     finish
 endif
 
 function! SyntaxCheckers_cuda_GetLocList()
-    let makeprg = g:syntastic_nvcc_binary.' --cuda -O0 -I . -Xcompiler -fsyntax-only '.shellescape(expand('%')).' -o /dev/null'
+    let makeprg = 'nvcc --cuda -O0 -I . -Xcompiler -fsyntax-only '.shellescape(expand('%')).' -o /dev/null'
     "let errorformat =  '%-G%f:%s:,%f:%l:%c: %m,%f:%l: %m'
     let errorformat =  '%*[^"]"%f"%*\D%l: %m,"%f"%*\D%l: %m,%-G%f:%l: (Each undeclared identifier is reported only once,%-G%f:%l: for each function it appears in.),%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,"%f"\, line %l%*\D%c%*[^ ] %m,%D%*\a[%*\d]: Entering directory `%f'',%X%*\a[%*\d]: Leaving directory `%f'',%D%*\a: Entering directory `%f'',%X%*\a: Leaving directory `%f'',%DMaking %*\a in %f,%f|%l| %m'
 
     if expand('%') =~? '\%(.h\|.hpp\|.cuh\)$'
         if exists('g:syntastic_cuda_check_header')
-            let makeprg = 'echo > .syntastic_dummy.cu ; '.g:syntastic_nvcc_binary.' --cuda -O0 -I . .syntastic_dummy.cu -Xcompiler -fsyntax-only -include '.shellescape(expand('%')).' -o /dev/null'
+            let makeprg = 'echo > .syntastic_dummy.cu ; nvcc --cuda -O0 -I . .syntastic_dummy.cu -Xcompiler -fsyntax-only -include '.shellescape(expand('%')).' -o /dev/null'
         else
             return []
         endif