From 64b8fbadb04b479189f2958f43f4a4ca8f6fc7d7 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Sat, 28 Oct 2017 05:26:01 -0400 Subject: [PATCH] build system: Deal with wildcard in subdirs-y This enabled subdirs-y += * to work properly. BUG=b:68384012 BRANCH=none TEST=Run `abuild -t GOOGLE_CORAL -p none` and observe that `find coreboot-builds/GOOGLE_CORAL -type d -name '\*'` doesn't return any files called '*'. Change-Id: Iba7866db339ae9b4063c4b4377500652eb1be13d Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/22208 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Aaron Durbin --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dedf6885b6..33b12f8a3c 100644 --- a/Makefile +++ b/Makefile @@ -236,7 +236,7 @@ includemakefiles= \ $$(abspath $$(subst $(dir $(1))/,/,$$(addprefix $(dir $(1)),$$($(class)-y)))))))) \ $(foreach special,$(special-classes), \ $(foreach item,$($(special)-y), $(call $(special)-handler,$(dir $(1)),$(item)))) \ - $(eval subdirs+=$$(subst $(CURDIR)/,,$$(abspath $$(addprefix $(dir $(1)),$$(subdirs-y))))) + $(eval subdirs+=$$(subst $(CURDIR)/,,$$(wildcard $$(abspath $$(addprefix $(dir $(1)),$$(subdirs-y)))))) # For each path in $(subdirs) call includemakefiles # Repeat until subdirs is empty