diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2013-03-19 12:43:18 -0500 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2013-03-22 00:17:06 +0100 |
| commit | 54553d9fc18d28033202c6b48c6b8cb49967c7e5 (patch) | |
| tree | 7c89c9c32301013b96634b9f295a1916acd3b5ec | |
| parent | 8dddc30eb55bc57b1e319d35a66a1889a9716ca1 (diff) | |
| download | coreboot-54553d9fc18d28033202c6b48c6b8cb49967c7e5.tar.xz | |
vboot: pass correct coreboot include paths
The coreboot include were not being passed correctly when
building vboot_reference. The paths being included were of the
src/<dir> form. However, vboot_reference lives in
src/../vboot_reference. That coupled with the recursive make
call made vboot_reference not see coreboot's header files.
Fix this by appending ../ to coreboot's default include paths.
Change-Id: I73949c6f854ecfce77ac36bb995918d51f91445e
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/2860
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
| -rw-r--r-- | src/vendorcode/google/chromeos/Makefile.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc index 9bc4d64163..abcd429297 100644 --- a/src/vendorcode/google/chromeos/Makefile.inc +++ b/src/vendorcode/google/chromeos/Makefile.inc @@ -53,9 +53,11 @@ VBOOT_STUB_DEPS += $(obj)/lib/memcmp.rmodules.o VBOOT_STUB_DEPS += $(obj)/arch/x86/lib/memset.rmodules.o VBOOT_STUB_DEPS += $(obj)/arch/x86/lib/memcpy.rmodules.o VBOOT_STUB_DEPS += $(VB_LIB) -# Remove the '-include' option since that will break vboot's build. -VBOOT_CFLAGS += $(filter-out -include $(src)/include/kconfig.h, $(CFLAGS)) +# Remove the '-include' option since that will break vboot's build and ensure +# vboot_reference can get to coreboot's include files. +VBOOT_CFLAGS += $(patsubst -I%,-I../%,$(filter-out -include $(src)/include/kconfig.h, $(CFLAGS))) VBOOT_CFLAGS += -DVBOOT_DEBUG +$(warning $(VBOOT_CFLAGS)) $(VBOOT_STUB_DOTO): $(VBOOT_STUB_DEPS) $(CC) $(LDFLAGS) -nostdlib -r -o $@ $^ |