diff options
| author | Jakub Czapiga <jacz@semihalf.com> | 2022-01-12 09:59:39 +0000 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2022-01-15 00:22:41 +0000 |
| commit | 395f5b3129ad046a220aa4cf975279bfdebc19df (patch) | |
| tree | 477af2cff7d7a40e47067c88b11178c4b9ff574b /payloads/libpayload/bin/lpgcc | |
| parent | d74b8d9c990780ba64515b36aaff79d719d71ead (diff) | |
libpayload: Install vboot headers and add include paths to lpgcc
New CBFS API uses commonlib/bsd/cbfs_serialized.h, which includes
vboot's vb2_sha.h. And, because vboot's includes are not available
in libpayload's installation directory nor in lpgcc paths, it was
causing compilation errors. This patch fixes this issue.
lpgcc will look for `vboot` directory like it is doing for `include`
directory to create correct paths. However, if payload will be built
using libpayload's build dir as a base, then vboot headers from
3rdparty/vboot will be used, as there is no way to pass VBOOT_SOURCE
from makefile to lpgcc.
Moreover, this patch moves VBOOT_SOURCE to the main Makefile to
make it available for installation target, to install headers from
vboot directory provided by caller.
Change-Id: I68dd7e1545cfcaf24547d8a9fe289447c79da222
Signed-off-by: Jakub Czapiga <jacz@semihalf.com>
Reported-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/61032
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'payloads/libpayload/bin/lpgcc')
| -rwxr-xr-x | payloads/libpayload/bin/lpgcc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/payloads/libpayload/bin/lpgcc b/payloads/libpayload/bin/lpgcc index a0b736b5e3..2ad9ef525a 100755 --- a/payloads/libpayload/bin/lpgcc +++ b/payloads/libpayload/bin/lpgcc @@ -169,6 +169,9 @@ if [ $_LIBDIR = $_OBJ ]; then fi _CFLAGS="$_CFLAGS -I$BASE/../../../src/commonlib/bsd/include" + _CFLAGS="$_CFLAGS -I$BASE/../../../3rdparty/vboot/firmware/include" +else + _CFLAGS="$_CFLAGS -I$_VBOOTINCDIR" fi # Check for the -fno-stack-protector silliness |