Merge pull request #714 from Pinata-Consulting/blocks-fix

blocks: changed environment variables leaked through to sub-make invocation

Author: maliberty

flow/Makefile

@@ -295,7 +295,15 @@ 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) "DESIGN_CONFIG=$(3)" generate_abstract
+	# 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 && \
+	$(MAKE) \"DESIGN_CONFIG=$(3)\" generate_abstract"
 endef
 
 # Targets to harden Blocks in case of hierarchical flow is triggered