diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-07-09 00:26:49 +0200 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-07-09 08:47:16 +0200 |
| commit | f53dbfaa8c20cd789afc7e54ff004d068095223c (patch) | |
| tree | 8bf10febf6ae62b47425b225d266c3d8a1827a1f /payloads/libpayload/Makefile | |
| parent | db03c2259a2ff2eceddecc92e7dd1fc6bc9ca126 (diff) | |
| download | coreboot-f53dbfaa8c20cd789afc7e54ff004d068095223c.tar.gz coreboot-f53dbfaa8c20cd789afc7e54ff004d068095223c.tar.bz2 coreboot-f53dbfaa8c20cd789afc7e54ff004d068095223c.zip | |
libpayload: Use top level xcompile
Instead of having a second copy that already within 2-3 days
becamer quite outdated, use the same xcompile copy for coreboot
and libpayload, as we do with Kconfig already.
This requires a simple change to the top level xcompile to understand
both CONFIG_COMPILER_GCC and CONFIG_LP_COMPILER_GCC (only one of
them will occur at the same time)
libpayload's .xcompile target was moved later so that it can make use
of $(top)
Change-Id: I44001067f551cd0776dd303cbaeaa40eb3d5c1db
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/10863
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'payloads/libpayload/Makefile')
| -rw-r--r-- | payloads/libpayload/Makefile | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index 2b9bbcbe1782..f3544d413ad8 100644 --- a/payloads/libpayload/Makefile +++ b/payloads/libpayload/Makefile @@ -34,20 +34,6 @@ ifeq ($(INNER_SCANBUILD),y) CC_real:=$(CC) endif -# 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) -HOSTCC:=$(CC_real) --hostcc -HOSTCXX:=$(CC_real) --hostcxx -endif - export top := $(CURDIR) export src := src export srck := $(abspath $(top)/../../util/kconfig) @@ -95,6 +81,20 @@ DOXYGEN_OUTPUT_DIR := doxygen all: real-all +# 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 $(top)/../../util/xcompile/xcompile $(XGCCPATH) > .xcompile))) + +.xcompile: $(top)/../../util/xcompile/xcompile + $< $(XGCCPATH) > $@.tmp + \mv -f $@.tmp $@ 2> /dev/null + +ifeq ($(INNER_SCANBUILD),y) +CC:=$(CC_real) +HOSTCC:=$(CC_real) --hostcc +HOSTCXX:=$(CC_real) --hostcxx +endif + # This include must come _before_ the pattern rules below! # Order _does_ matter for pattern rules. include $(srck)/Makefile |