Skip to content

Commit aa56a69

Browse files
committed
Revert "makefile: SUB_MAKE fix"
This reverts commit 830248a. This breaks the CI Signed-off-by: Matt Liberty <[email protected]>
1 parent 35fecab commit aa56a69

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

flow/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
THIS_FILE = $(MAKEFILE_LIST)
21
# settings.mk is not under source control. Put variables into this
32
# file to avoid having to adding the to the make command line.
43
-include settings.mk
@@ -550,7 +549,7 @@ endif
550549

551550
UNSET_VARS = for var in $(UNSET_VARIABLES_NAMES); do unset $$var; done
552551

553-
SUB_MAKE = $(MAKE) $(foreach V,$(COMMAND_LINE_ARGS), $(if $($V),$V=$(shell echo "$($V)" | $(FLOW_HOME)/scripts/escape.sh),$V='')) --no-print-directory --file=$(THIS_FILE) DESIGN_CONFIG=$(DESIGN_CONFIG)
552+
SUB_MAKE = $(MAKE) $(foreach V,$(COMMAND_LINE_ARGS), $(if $($V),$V=$(shell echo "$($V)" | $(FLOW_HOME)/scripts/escape.sh),$V='')) --no-print-directory DESIGN_CONFIG=$(DESIGN_CONFIG)
554553
UNSET_AND_MAKE = @bash -c '$(UNSET_VARS); $(SUB_MAKE) $$@' --
555554

556555
$(OBJECTS_DIR)/copyright.txt:

0 commit comments

Comments
 (0)