From 6f5e5e5aa8912ec746ac52b649ddaeae75c25318 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Mon, 29 Jun 2020 22:28:18 +0200 Subject: [PATCH] src/arch/x86: Ensure $(objgenerated) exists before it's used In some rare cases it seems that make tries to build $(objgenerated)/assembly.inc before the build-dirs target has finished, and so assembly.inc can't be written. Enforce that build-dirs is done before assembly.inc starts. BUG=chromium:1098215 BRANCH=none TEST=none Change-Id: Ib141ea45a43836cfdde0059523c331fe5286b06d Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/c/coreboot/+/42883 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/arch/x86/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 6297384b2f..1a1aa408b1 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -50,7 +50,7 @@ pci$(stripped_vgabios_dgpu_id).rom-type := optionrom # into a single generated file. crt0s = $(cpu_incs-y) -$(objgenerated)/assembly.inc: $$(crt0s) +$(objgenerated)/assembly.inc: build-dirs $$(crt0s) @printf " GEN $(subst $(obj)/,,$(@))\n" printf '$(foreach crt0,$(crt0s),#include "$(crt0)"\n)' > $@