From c090bf7fce31771b6689b7c144fb6d7bbada7777 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Sun, 29 May 2016 03:13:43 +0200 Subject: [PATCH] mk: always consider spec files in repos/base --- tool/builddir/build.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tool/builddir/build.mk b/tool/builddir/build.mk index 5666a6097..5bbb93564 100644 --- a/tool/builddir/build.mk +++ b/tool/builddir/build.mk @@ -75,7 +75,16 @@ select_from_repositories = $(firstword $(foreach REP,$(REPOSITORIES),$(wildcard -include $(call select_from_repositories,etc/specs.conf) -include $(BUILD_BASE_DIR)/etc/specs.conf -export SPEC_FILES := $(foreach SPEC,$(SPECS),$(call select_from_repositories,mk/spec/$(SPEC).mk)) + +# +# Determine the spec files to incorporate into the build configuration from the +# repositories. Always consider the spec files present in BASE_DIR. This is +# needed when the build system is invoked from the package-build tool where the +# repos/base is not present in the list of REPOSITORIES. +# +export SPEC_FILES := \ + $(sort $(foreach SPEC,$(SPECS),$(call select_from_repositories,mk/spec/$(SPEC).mk)) \ + $(wildcard $(foreach SPEC,$(SPECS),$(BASE_DIR)/mk/spec/$(SPEC).mk))) include $(SPEC_FILES) export SPECS