Merge pull request #1644 from Pinata-Consulting/makefile-fix-recursive-sub-make

Makefile fix recursive sub make command line args erasure

Author: maliberty

flow/Makefile

@@ -507,7 +507,8 @@ IS_CHIP = 1
 endif
 
 UNSET_VARS = for var in $(UNSET_VARIABLES_NAMES); do unset $$var; done
-SUB_MAKE = $(MAKE) --no-print-directory DESIGN_CONFIG=$(DESIGN_CONFIG)
+
+SUB_MAKE = $(MAKE) $(foreach V,$(COMMAND_LINE_ARGS), $(if $($V),$V=$(shell echo $($V) | sed 's/ /\\ /g'),$V='')) --no-print-directory DESIGN_CONFIG=$(DESIGN_CONFIG)
 UNSET_AND_MAKE = @bash -c '$(UNSET_VARS); $(SUB_MAKE) $$@' --
 
 # Separate dependency checking and doing a step. This can

flow/util/generate-vars.sh

@@ -10,6 +10,7 @@ EXCLUDED_VARS+='|RESULTS_ODB|PUBLIC|ISSUE_SCRIPTS'
 EXCLUDED_VARS+='|HOME|PWD|MAIL|SHELL|NPROC|NUM_CORES|FLOW_HOME|\\n'
 EXCLUDED_VARS+='|UNSET_VARIABLES_NAMES|do-step|get_variables|do-copy'
 EXCLUDED_VARS+='|CURDIR|OPEN_GUI|OPEN_GUI_SHORTCUT'
+EXCLUDED_VARS+='|COMMAND_LINE_ARGS'
 
 EXCLUDED_PATTERNS="_EXE$|PATH$|_CMD$|\."
 

flow/util/utils.mk

@@ -93,6 +93,8 @@ export UNSET_VARIABLES_NAMES := $(call get_variables,command% line environment%
 export ISSUE_VARIABLES_NAMES := $(call get_variables,environment% default automatic)
 export ISSUE_VARIABLES := $(foreach V, $(ISSUE_VARIABLES_NAMES), $(if $($V),$V=$($V),$V='')${\n})
 
+export COMMAND_LINE_ARGS := $(foreach V,$(.VARIABLES),$(if $(filter command% line, $(origin $V)),$(V)))
+
 $(foreach script,$(ISSUE_SCRIPTS),$(script)_issue): %_issue : versions.txt
 	$(UTILS_DIR)/makeIssue.sh $*