[coreboot-gerrit] New patch to review for coreboot: libpayload: defer including .xcompile

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10801

-gerrit

commit 2e7d1f3f6be7643dc38f26bb6a281cc4b17ce9e8
Author: Patrick Georgi <pgeorgi at chromium.org>
Date:   Mon Jul 6 09:05:48 2015 +0000

    libpayload: defer including .xcompile
    
    It needs to come after DOTCONFIG so that the compiler decision can
    be made.
    
    Change-Id: I5c6730ac58ab8731f07bb7c5161b2d0a59588e28
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
---
 payloads/libpayload/Makefile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile
index 1c3cd8d..252075f 100644
--- a/payloads/libpayload/Makefile
+++ b/payloads/libpayload/Makefile
@@ -34,8 +34,13 @@ ifeq ($(INNER_SCANBUILD),y)
 CC_real:=$(CC)
 endif
 
-$(if $(wildcard .xcompile),,$(eval $(shell bash util/xcompile/xcompile > .xcompile)))
-include .xcompile
+# in addition to the dependency below, create the file if it doesn't exist
+# to silence stupid warnings about a file that would be generated anyway.
+$(if $(wildcard .xcompile),,$(eval $(shell util/xcompile/xcompile $(XGCCPATH) > .xcompile)))
+
+.xcompile: util/xcompile/xcompile
+	$< $(XGCCPATH) > $@.tmp
+	\mv -f $@.tmp $@ 2> /dev/null
 
 ifeq ($(INNER_SCANBUILD),y)
 CC:=$(CC_real)
@@ -96,6 +101,8 @@ include $(srck)/Makefile
 
 include $(HAVE_DOTCONFIG)
 
+include .xcompile
+
 ARCHDIR-$(CONFIG_LP_ARCH_ARM)     := arm
 ARCHDIR-$(CONFIG_LP_ARCH_ARM64)   := arm64
 ARCHDIR-$(CONFIG_LP_ARCH_MIPS)    := mips