From 1a77d1e437c7dc4efd8ab665ccf1ed9d18ba835d Mon Sep 17 00:00:00 2001 From: Werner Zeh Date: Mon, 24 Jun 2024 07:31:38 +0200 Subject: Makefile.mk: Fix inclusion of site-local/Makefile.inc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In commit 854dd9a5d1153fbb7ace2a7619bb98d024e284ce (Makefile.mk: Put site-local path first) the inclusion of site-local/Makefile.inc was moved to the first place. Unfortunately, the very next line where subdirs-y is modified resets the variable instead of extending it which overwrites the inclusion of site-local/Makefile.inc. This breaks setups where site-local/Makefile.inc is required. This patch fixes it. Change-Id: I36ad1aca5742869c84e2fb556f898f896c6f037a Signed-off-by: Werner Zeh Reviewed-on: https://review.coreboot.org/c/coreboot/+/83190 Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer Reviewed-by: Elyes Haouas Reviewed-by: Michał Kopeć --- Makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.mk b/Makefile.mk index 301a3bc835..16b65395d6 100644 --- a/Makefile.mk +++ b/Makefile.mk @@ -99,7 +99,7 @@ PHONY+= clean-abuild coreboot check-style build_complete # site-local Makefile.mk must go first to override default locations (for binaries etc.) subdirs-y := site-local -subdirs-y := src/lib src/commonlib/ src/console src/device src/acpi src/superio/common +subdirs-y += src/lib src/commonlib/ src/console src/device src/acpi src/superio/common subdirs-$(CONFIG_EC_ACPI) += src/ec/intel subdirs-y += src/ec/acpi $(wildcard src/ec/*/*) $(wildcard src/southbridge/*/*) subdirs-y += $(wildcard src/soc/*) $(wildcard src/soc/*/common) $(filter-out $(wildcard src/soc/*/common),$(wildcard src/soc/*/*)) -- cgit v1.2.3