Skip to content

Commit 935f312

Browse files
committed
makefile: exclude do-step and do-copy for make issue and $(UNSET_AND_MAKE)
This fixes the following warnings on CentOS 7, not visible on e.g. Ubuntu 22.04: $ make test-unset-and-make-print-PATH [deleted] --: line 0: unset: `do-copy': not a valid identifier --: line 0: unset: `do-step': not a valid identifier [deleted] Signed-off-by: Øyvind Harboe <[email protected]>
1 parent 66529fc commit 935f312

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

flow/util/utils.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ define \n
8787
endef
8888

8989
define get_variables
90-
$(foreach V, $(.VARIABLES),$(if $(filter-out $(1), $(origin $V)), $(if $(filter-out .% %QT_QPA_PLATFORM% %TIME_CMD% KLAYOUT% GENERATE_ABSTRACT_RULE%, $(V)), $V$ )))
90+
$(foreach V, $(.VARIABLES),$(if $(filter-out $(1), $(origin $V)), $(if $(filter-out .% %QT_QPA_PLATFORM% %TIME_CMD% KLAYOUT% GENERATE_ABSTRACT_RULE% do-step% do-copy%, $(V)), $V$ )))
9191
endef
9292

9393
export UNSET_VARIABLES_NAMES := $(call get_variables,command% line environment% default automatic)

0 commit comments

Comments
 (0)