Removed need to export architecture filters from first loop

.pre-commit-config.yaml

@@ -3,7 +3,7 @@ repos:
     rev: 22.3.0
     hooks:
       - id: black
-  - repo: https://gitlab.com/PyCQA/flake8
+  - repo: https://gitlab.com/pycqa/flake8.git
     rev: 3.9.2
     hooks:
     -   id: flake8

require-ess/tools/driver.makefile

@@ -54,8 +54,6 @@
 # HEADERS
 #    Header files to install (e.g. to be included by other drivers)
 #    If not defined, all headers are for local use only.
-# EXCLUDE_VERSIONS
-#    EPICS versions to skip. Usually 3.13 or 3.14
 # ARCH_FILTER
 #    Sub set of architectures to build for, e.g. %-ppc604
 
@@ -189,9 +187,6 @@ ifndef EPICSVERSION
 ## RUN 1
 # In source directory
 
-export ARCH_FILTER
-export EXCLUDE_ARCHS
-
 export SUBS
 export TMPS
 
@@ -295,8 +290,9 @@ SCR += ${SCRIPTS_${EPICSVERSION}}
 export SCR
 
 # Filter architectures to build using EXCLUDE_ARCHS and ARCH_FILTER.
-CROSS_COMPILER_TARGET_ARCHS := ${EPICS_HOST_ARCH} ${CROSS_COMPILER_TARGET_ARCHS}
-CROSS_COMPILER_TARGET_ARCHS := $(filter-out $(addprefix %,${EXCLUDE_ARCHS}),$(filter-out $(addsuffix %,${EXCLUDE_ARCHS}),$(if ${ARCH_FILTER},$(filter ${ARCH_FILTER},${CROSS_COMPILER_TARGET_ARCHS}),${CROSS_COMPILER_TARGET_ARCHS})))
+ALL_ARCHS = ${EPICS_HOST_ARCH} ${CROSS_COMPILER_TARGET_ARCHS}
+BUILD_ARCHS = $(filter-out $(addprefix %,${EXCLUDE_ARCHS}),$(filter-out $(addsuffix %,${EXCLUDE_ARCHS}),\
+        $(if ${ARCH_FILTER},$(filter ${ARCH_FILTER},${ALL_ARCHS}),${ALL_ARCHS})))
 
 SRCS_Linux = ${SOURCES_Linux}
 export SRCS_Linux
@@ -326,14 +322,14 @@ install build debug::
 debug::
 	@echo "===================== Pass 2: EPICSVERSION = $(EPICSVERSION) ====================="
 	@echo "EPICS_BASE = ${EPICS_BASE}"
-	@echo "CROSS_COMPILER_TARGET_ARCHS = ${CROSS_COMPILER_TARGET_ARCHS}"
+	@echo "BUILD_ARCHS = ${BUILD_ARCHS}"
 	@echo "EXCLUDE_ARCHS = ${EXCLUDE_ARCHS}"
 	@echo "LIBVERSION = ${LIBVERSION}"
 
 # Loop over all architectures.
 install build debug:: $(COMMON_DIR)
 	@+failed_builds=0; \
-	for ARCH in ${CROSS_COMPILER_TARGET_ARCHS}; do \
+	for ARCH in ${BUILD_ARCHS}; do \
 	    umask 002; echo MAKING ARCH $$ARCH; ${MAKE} -f ${USERMAKEFILE} T_A=$$ARCH $@ || ((failed_builds++)); \
 	done; \
 	((failed_builds == 0))