[coreboot-gerrit] New patch to review for coreboot: b64d9da build system: avoid more race conditions

[Patrick Georgi (patrick@georgi-clan.de)]

Patrick Georgi (patrick at georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6242

-gerrit

commit b64d9dac5ba501051e80f11612894664bb75438b
Author: Patrick Georgi <patrick.georgi at secunet.com>
Date:   Thu Jul 10 09:42:03 2014 +0200

    build system: avoid more race conditions
    
    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 <patrick.georgi at secunet.com>
---
 Makefile.inc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index 5e4c5c5..42ed707 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)