From dd9f38d7112d21b010ac6334b230e113b1338e1d Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Tue, 26 Jan 2021 17:14:00 +0100 Subject: [PATCH] Build: Fix spurious failures with SNIPPETS in Windows Under some combinations of shell / Make version / Windows version, Windows make was giving up searching for a target "../" --- configure/RULES_EXPAND | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure/RULES_EXPAND b/configure/RULES_EXPAND index 51657ebd8..f61666bb7 100644 --- a/configure/RULES_EXPAND +++ b/configure/RULES_EXPAND @@ -33,8 +33,10 @@ expand_clean: ASSEMBLE_TOOL ?= $(PERL) $(TOOLS)/assembleSnippets.pl define COMMON_ASSEMBLY_template +ifneq '$$($1_PATTERN)' '' $1_SNIPPETS += $$(foreach dir, .. $$(SRC_DIRS), \ $$(wildcard $$(dir)/$$($1_PATTERN))) +endif $(COMMON_DIR)/$1: $$($1_SNIPPETS) $(ECHO) "Assembling common file $$@ from snippets" @$(RM) $1 @@ -45,8 +47,10 @@ $(foreach asy, $(COMMON_ASSEMBLIES), \ $(eval $(call COMMON_ASSEMBLY_template,$(strip $(asy))))) define ASSEMBLY_template +ifneq '$$($1_PATTERN)' '' $1_SNIPPETS += $$(foreach dir, .. $$(SRC_DIRS), \ $$(wildcard $$(dir)/$$($1_PATTERN))) +endif $1: $$($1_SNIPPETS) $(ECHO) "Assembling file $$@ from snippets" @$(RM) $$@