diff --git a/Makefile b/Makefile
index a28291d72..2fe453219 100644
--- a/Makefile
+++ b/Makefile
@@ -617,10 +617,6 @@ devsetup: Makefile.autoconf
 	  echo '$(TERM_INFO)  eval $$(opam config env)$(TERM_RESET)' >&2; \
 	fi
 
-# print any variable for Makefile debugging
-print-%:
-	$(QUIET)echo '$*=$($*)'
-
 # print list of targets
 .PHONY: show-targets
 show-targets:
diff --git a/Makefile.config b/Makefile.config
index 069dc0789..32e8f5f2f 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -190,3 +190,7 @@ define silent_on_success
   fi
 endef
 endif
+
+# print any variable for Makefile debugging
+print-%:
+	$(QUIET)echo '$*=$($*)'
diff --git a/infer/src/Makefile b/infer/src/Makefile
index f97362fe4..aff0b563e 100644
--- a/infer/src/Makefile
+++ b/infer/src/Makefile
@@ -295,7 +295,3 @@ clean:
 .PHONY: fmt
 fmt:
 	@$(MAKE) -C $(ROOT_DIR) fmt
-
-# print any variable for Makefile debugging
-print-%:
-	$(QUIET)echo '$*=$($*)'
diff --git a/infer/src/base/CommandLineOption.mli b/infer/src/base/CommandLineOption.mli
index a150dfca8..b46a87025 100644
--- a/infer/src/base/CommandLineOption.mli
+++ b/infer/src/base/CommandLineOption.mli
@@ -52,6 +52,8 @@ val is_originator : bool
 
 val init_work_dir : string
 
+val strict_mode : bool
+
 (** The [mk_*] functions declare command line options, while [parse] parses then according to the
     declared options.
 
diff --git a/infer/src/base/Config.ml b/infer/src/base/Config.ml
index 2cdc88afb..9e857c96b 100644
--- a/infer/src/base/Config.ml
+++ b/infer/src/base/Config.ml
@@ -895,7 +895,7 @@ and ( bo_debug
   and keep_going =
     CLOpt.mk_bool ~deprecated_no:["-no-failures-allowed"] ~long:"keep-going"
       ~in_help:CLOpt.([(Analyze, manual_generic)])
-      ~default:true "Keep going when the analysis encounters a failure"
+      ~default:(not CLOpt.strict_mode) "Keep going when the analysis encounters a failure"
   and reports_include_ml_loc =
     CLOpt.mk_bool ~deprecated:["with_infer_src_loc"] ~long:"reports-include-ml-loc"
       "Include the location in the Infer source code from where reports are generated"