diff --git a/make/targets-tools.mk b/make/targets-tools.mk
index 71c52602..dc759ca3 100644
--- a/make/targets-tools.mk
+++ b/make/targets-tools.mk
@@ -81,18 +81,26 @@ clang-tidy-clean:
 	rm -f clang-tidy-cache*.tmp
 CLANG_TIDY_CACHE_CPP = clang-tidy-cache-cpp.tmp
 $(CLANG_TIDY_CACHE_CPP): $(LOCAL_CPP)
-	$(CLANG_TIDY) $(LOCAL_CPP) -- $(INCLUDE) -x c++ -fix | $(CLANG_TIDY_FILTER) | tee $@
+	$(CLANG_TIDY) $(LOCAL_CPP) -- $(INCLUDE) -x c++ | $(CLANG_TIDY_FILTER) | tee $@
 
 clang-tidy-h-c-cpp:
+ifneq ($(CLANG_TIDY_H_C_CPP),)
 	$(CLANG_TIDY) $(CLANG_TIDY_H_C_CPP) -- $(INCLUDE)
+endif
 clang-tidy-h-c:
+ifneq ($(CLANG_TIDY_H_C_C),)
 	$(CLANG_TIDY) $(CLANG_TIDY_H_C)     -- $(INCLUDE)
+endif
 clang-tidy-h-cpp:
+ifneq ($(CLANG_TIDY_H_CPP),)
 	$(CLANG_TIDY) $(CLANG_TIDY_H_CPP)   -- $(INCLUDE) -x c++
+endif
 clang-tidy-h: clang-tidy-h-c clang-tidy-h-cpp clang-tidy-h-c-cpp
 
 clang-tidy-c:
-	$(CLANG_TIDY) $(LOCAL_C) -- $(INCLUDE) -fix
+ifneq ($(LOCAL_C),)
+	$(CLANG_TIDY) $(LOCAL_C) -- $(INCLUDE)
+endif
 clang-tidy-cpp: $(CLANG_TIDY_CACHE_CPP)
 	cat $<
 clang-tidy: clang-tidy-h clang-tidy-c clang-tidy-cpp