From 08eaa7d5ee0a2547ea9b987dd7276619b4194e91 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 28 Oct 2023 15:15:30 -0700 Subject: [PATCH] Makefile: Simplify the cov-build target Simplify the Coverity build by always setting the BUILD_2X_MODULE, CONFIG_SCSI_QLA_FC and CONFIG_SCSI_QLA2XXX_TARGET variables. Setting these variables when not building a QLogic driver is safe because these variables only have an impact when building the QLogic drivers. See also commit 5c7fa240311f ("Makefile: Introduce the 'make cov-build'"). --- Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 9cfbaeabf..313691a98 100644 --- a/Makefile +++ b/Makefile @@ -189,13 +189,11 @@ tags: find . -type f -name "*.[ch]" | ctags --c-kinds=+p --fields=+iaS --extra=+q -e -L- cov-build: - -for d in $(SCST_DIR) $(ISCSI_DIR) $(OLD_QLA_DIR) $(NEW_QLA_DIR) $(SRP_DIR) \ - $(SCST_LOCAL_DIR) $(FCST_DIR) $(USR_DIR) $(SCSTADM_DIR); do \ - if [[ $$d = $(OLD_QLA_DIR) || $$d = $(NEW_QLA_DIR) ]]; then \ - BUILD_2X_MODULE=y $(MAKE) -j$$(nproc) -C "$$d" all || break; \ - else \ - $(MAKE) -j$$(nproc) -C "$$d" all || break; \ - fi \ + -for d in $(SCST_DIR) $(ISCSI_DIR) $(OLD_QLA_DIR) $(NEW_QLA_DIR) \ + $(SRP_DIR) $(SCST_LOCAL_DIR) $(FCST_DIR) $(USR_DIR) \ + $(SCSTADM_DIR); do \ + BUILD_2X_MODULE=y CONFIG_SCSI_QLA_FC=y \ + CONFIG_SCSI_QLA2XXX_TARGET=y $(MAKE) -j$$(nproc) -C "$$d"; \ done all clean extraclean install uninstall: