summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@google.com>2017-10-28 05:26:01 -0400
committerPatrick Georgi <pgeorgi@google.com>2017-10-29 08:48:54 +0000
commit64b8fbadb04b479189f2958f43f4a4ca8f6fc7d7 (patch)
tree0a47ba9ce4243c2e7244e63e9f42d8287ea3f055
parent2d65d2043664fc5b04a59ac1a1b18282228e1b41 (diff)
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 <pgeorgi@google.com> Reviewed-on: https://review.coreboot.org/22208 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
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