diff --git a/Makefile.in b/Makefile.in
index 18b657d8f..8ac911862 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -655,7 +655,7 @@ depend: | show-MKDIR_P
 lint:
 	$v build_tools/lint.fish "$(CXX)" $(CXXFLAGS) $(CPPFLAGS)
 lint-all:
-	$v build_tools/lint.fish "$(CXX)" --all $(CXXFLAGS) $(CPPFLAGS)
+	$v build_tools/lint.fish --all "$(CXX)" $(CXXFLAGS) $(CPPFLAGS)
 .PHONY: lint lint-all
 
 #
diff --git a/build_tools/lint.fish b/build_tools/lint.fish
index e6fd1ee09..616bea1ea 100755
--- a/build_tools/lint.fish
+++ b/build_tools/lint.fish
@@ -13,7 +13,7 @@ set all no
 set kernel_name (uname -s)
 set machine_type (uname -m)
 
-argparse a/all -- $argv
+argparse -s a/all -- $argv
 set -q argv[1]; and set -gx CXX $argv[1]
 set -e argv[1]