GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Patrick Georgi 2015-07-06 09:05:48 +00:00 committed by Patrick Georgi
parent b7d8f26eec
commit db0325591d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
payloads/libpayload/Makefile
View File

@ -34,8 +34,13 @@ ifeq ($(INNER_SCANBUILD),y)
CC_real:=$(CC) CC_real:=$(CC)
endif endif
$(if $(wildcard .xcompile),,$(eval $(shell bash util/xcompile/xcompile > .xcompile))) # in addition to the dependency below, create the file if it doesn't exist
include .xcompile # 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) ifeq ($(INNER_SCANBUILD),y)
CC:=$(CC_real) CC:=$(CC_real)
@ -96,6 +101,8 @@ include $(srck)/Makefile
include $(HAVE_DOTCONFIG) include $(HAVE_DOTCONFIG)
include .xcompile
ARCHDIR-$(CONFIG_LP_ARCH_ARM) := arm ARCHDIR-$(CONFIG_LP_ARCH_ARM) := arm
ARCHDIR-$(CONFIG_LP_ARCH_ARM64) := arm64 ARCHDIR-$(CONFIG_LP_ARCH_ARM64) := arm64
ARCHDIR-$(CONFIG_LP_ARCH_MIPS) := mips ARCHDIR-$(CONFIG_LP_ARCH_MIPS) := mips