diff --git a/Makefile.in b/Makefile.in
index 6201bb742..cdb8ae2dc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -870,9 +870,9 @@ depend: | show-MKDIR_P
 # TODO - why not have the Makefile run lint.fish on actual files itself (generate a report target?)
 #
 lint:
-	$v build_tools/lint.fish $(CXX) $(CXXFLAGS) $(CPPFLAGS)
+	$v build_tools/lint.fish "$(CXX)" $(CXXFLAGS) $(CPPFLAGS)
 lint-all:
-	$v build_tools/lint.fish $(CXX) --all $(CXXFLAGS) $(CPPFLAGS)
+	$v build_tools/lint.fish "$(CXX)" --all $(CXXFLAGS) $(CPPFLAGS)
 .PHONY: lint lint-all
 
 #
diff --git a/build_tools/lint.fish b/build_tools/lint.fish
index 0b14e564a..e7d769a1c 100755
--- a/build_tools/lint.fish
+++ b/build_tools/lint.fish
@@ -106,7 +106,7 @@ if set -q c_files[1]
         set -l cm (set_color magenta)
         set -l cbrm (set_color brmagenta)
         set -l template "[$cb$cu{file}$cn$cb:{line}$cn] $cbrm{severity}$cm ({id}):$cn\n {message}"
-        set cppcheck_args -q --verbose --std=posix --language=c++ --template $template \
+        set cppcheck_args -q --verbose --std=c++11 --std=posix --language=c++ --template $template \
             --suppress=missingIncludeSystem --inline-suppr --enable=$cppchecks \
             --rule-file=.cppcheck.rules --suppressions-list=.cppcheck.suppressions $cppcheck_args