diff options
| author | Nico Huber <nico.h@gmx.de> | 2018-10-04 23:42:42 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2018-10-08 16:57:27 +0000 |
| commit | d44221f9c8f3686e040ff9481829315068b321a3 (patch) | |
| tree | 76337bf1cae88feda44e3c63dd7e32e964e8767d /util/cbfstool/Makefile.inc | |
| parent | 834543c0c71544b547194b093b8e1da990722762 (diff) | |
| download | coreboot-d44221f9c8f3686e040ff9481829315068b321a3.tar.gz coreboot-d44221f9c8f3686e040ff9481829315068b321a3.tar.bz2 coreboot-d44221f9c8f3686e040ff9481829315068b321a3.zip | |
Move compiler.h to commonlib
Its spreading copies got out of sync. And as it is not a standard header
but used in commonlib code, it belongs into commonlib. While we are at
it, always include it via GCC's `-include` switch.
Some Windows and BSD quirk handling went into the util copies. We always
guard from redefinitions now to prevent further issues.
Change-Id: I850414e6db1d799dce71ff2dc044e6a000ad2552
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/28927
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'util/cbfstool/Makefile.inc')
| -rw-r--r-- | util/cbfstool/Makefile.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc index 8e4d8b6f4edf..1787eb14c02d 100644 --- a/util/cbfstool/Makefile.inc +++ b/util/cbfstool/Makefile.inc @@ -80,6 +80,7 @@ TOOLCPPFLAGS += -I$(top)/util/cbfstool/flashmap TOOLCPPFLAGS += -I$(top)/util/cbfstool TOOLCPPFLAGS += -I$(objutil)/cbfstool TOOLCPPFLAGS += -I$(top)/src/commonlib/include +TOOLCPPFLAGS += -include $(top)/src/commonlib/include/commonlib/compiler.h TOOLCPPFLAGS += -DNEED_VB2_SHA_LIBRARY TOOLCPPFLAGS += -I$(VBOOT_SOURCE)/firmware/include TOOLCPPFLAGS += -I$(VBOOT_SOURCE)/firmware/2lib/include @@ -131,7 +132,7 @@ $(objutil)/cbfstool/%.o: $(top)/src/commonlib/%.c $(objutil)/cbfstool/%.o: $(top)/util/cbfstool/lz4/lib/%.c printf " HOSTCC $(subst $(objutil)/,,$(@))\n" - $(HOSTCC) $(TOOLCPPFLAGS) $(TOOLCFLAGS) $(HOSTCFLAGS) -include $(top)/util/cbfstool/compiler.h -c -o $@ $< + $(HOSTCC) $(TOOLCPPFLAGS) $(TOOLCFLAGS) $(HOSTCFLAGS) -c -o $@ $< $(objutil)/cbfstool/cbfstool: $(addprefix $(objutil)/cbfstool/,$(cbfsobj)) printf " HOSTCC $(subst $(objutil)/,,$(@)) (link)\n" |