summaryrefslogtreecommitdiff
path: root/payloads/libpayload
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@chromium.org>2015-07-06 09:05:48 +0000
committerPatrick Georgi <pgeorgi@google.com>2015-07-06 18:26:12 +0200
commitdb0325591d5abe39544602b92cc141f7ba4d6f5a (patch)
treebdbdbbf3bbab0d175eeebcd95794b6adc72922ca /payloads/libpayload
parentb7d8f26eec171aa6964cf617221aeb2eaec0a976 (diff)
downloadcoreboot-db0325591d5abe39544602b92cc141f7ba4d6f5a.tar.xz
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@chromium.org> Reviewed-on: http://review.coreboot.org/10801 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'payloads/libpayload')
-rw-r--r--payloads/libpayload/Makefile11
1 files changed, 9 insertions, 2 deletions
diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile
index 1c3cd8dd2e..252075ff6c 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