makefile: less brittle BLOCKS

all env vars of current design are unset before invoking submake

Signed-off-by: Øyvind Harboe <[email protected]>

Author: oharboe

flow/Makefile

@@ -318,16 +318,7 @@ export WRAPPED_GDSOAS = $(foreach lef,$(notdir $(WRAP_LEFS)),$(OBJECTS_DIR)/$(le
 define GENERATE_ABSTRACT_RULE
 # Single rule, two targets, hence the "&:", syntax
 $(1) $(2) &: $(3)
-	# Make sure environment variables modified in this Makefile do not leak into the sub-build
-	bash -c " \
-	unset BLOCKS && \
-	unset ADDITIONAL_LEFS && \
-	unset ADDITIONAL_GDS && \
-	unset ADDITIONAL_LIBS && \
-	unset DONT_USE_SC_LIB && \
-	unset LIB_FILES && \
-	unset MACRO_PLACEMENT && \
-	$(MAKE) \"DESIGN_CONFIG=$(3)\" generate_abstract"
+	$$(UNSET_AND_MAKE) DESIGN_CONFIG=$(3) generate_abstract
 endef
 
 # Targets to harden Blocks in case of hierarchical flow is triggered