From 533c119f5b4fd7725ab3f09a0f3af7b623cc501d Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Thu, 10 Jul 2014 09:42:03 +0200 Subject: build system: avoid more race conditions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In an abuild run, cbfstool is built in a shared directory using "make tools". Unfortunately the build system doesn't actually use that binary directly but creates a per-board copy (for convenience purposes when editing the image later) and uses that. With this change the build system uses the original file but still creates the copy for the user, avoiding the race while ensuring convenience. Change-Id: I38c603a7eca5ef859875ad3031bf7a850189645f Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/6242 Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan Reviewed-by: Kyösti Mälkki --- Makefile.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 5e4c5c558d..42ed707e8d 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -57,7 +57,7 @@ export objgenerated := $(obj)/generated ####################################################################### # root rule to resolve if in build mode (ie. configuration exists) real-target: $(obj)/config.h coreboot -coreboot: build-dirs $(obj)/coreboot.rom +coreboot: build-dirs $(obj)/coreboot.rom $(obj)/cbfstool $(obj)/rmodtool ####################################################################### # our phony targets @@ -258,13 +258,13 @@ build-dirs: ####################################################################### # Build the tools -CBFSTOOL:=$(obj)/cbfstool -RMODTOOL:=$(obj)/rmodtool +CBFSTOOL:=$(objutil)/cbfstool/cbfstool +RMODTOOL:=$(objutil)/cbfstool/rmodtool -$(CBFSTOOL): $(objutil)/cbfstool/cbfstool +$(obj)/cbfstool: $(CBFSTOOL) cp $< $@ -$(RMODTOOL): $(objutil)/cbfstool/rmodtool +$(obj)/rmodtool: $(RMODTOOL) cp $< $@ _WINCHECK=$(shell uname -o 2> /dev/null) -- cgit v1.2.3