From d054bbd4f1ba1675486df38afdc186d9f31760f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=BBygowski?= Date: Wed, 9 Nov 2022 10:23:11 +0100 Subject: [PATCH] Makefile.inc: fix multiple jobs build issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Certain C source files for coreboot stages require fmap_config.h to be present. When building coreboot using multiple jobs the dependency is not always satisfied due to race condition and results in make error. Work around it by adding fmap_config.h to stage C deps. Signed-off-by: Michał Żygowski Change-Id: I3a70beedf2eb1c018c5ff98163904253f9a87a61 Reviewed-on: https://review.coreboot.org/c/coreboot/+/69819 Reviewed-by: Nico Huber Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) Reviewed-by: Krystian Hebel --- Makefile.inc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile.inc b/Makefile.inc index 9365a4abbb..ba4f6fad1e 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -653,6 +653,14 @@ bootblock-c-deps+=$(DEVICETREE_STATIC_C) postcar-c-deps+=$(DEVICETREE_STATIC_C) smm-c-deps+=$(DEVICETREE_STATIC_C) +# Ensure fmap_config.h are created before any objects are compiled +ramstage-c-deps+=$(obj)/fmap_config.h +romstage-c-deps+=$(obj)/fmap_config.h +verstage-c-deps+=$(obj)/fmap_config.h +bootblock-c-deps+=$(obj)/fmap_config.h +postcar-c-deps+=$(obj)/fmap_config.h +smm-c-deps+=$(obj)/fmap_config.h + .PHONY: devicetree devicetree: $(DEVICETREE_STATIC_C)