From dc5c83812b0d4ff506a71a226d3c575a995283e4 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Sat, 14 Nov 2020 23:13:58 +0100 Subject: libpayload/lpgcc: Turn references to build dir into a variable Introduce a `$_OBJ` variable, that points to the build directory for in-tree usage of `lpgcc`. If unset, the default `../build` relative to the location of `lpgcc` is used. Change-Id: I35112d7533d69aa51252dd2bceec010a62522403 Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/c/coreboot/+/47629 Reviewed-by: Raul Rangel Tested-by: build bot (Jenkins) --- payloads/libpayload/bin/lpgcc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'payloads/libpayload/bin/lpgcc') diff --git a/payloads/libpayload/bin/lpgcc b/payloads/libpayload/bin/lpgcc index aa09c1d116..1e63d0577e 100755 --- a/payloads/libpayload/bin/lpgcc +++ b/payloads/libpayload/bin/lpgcc @@ -137,7 +137,7 @@ while [ $# -gt 0 ]; do shift done -_CFLAGS="$_ARCHEXTRA -nostdinc -nostdlib -I$BASE/../build -I$_INCDIR -I$_ARCHINCDIR -D__LIBPAYLOAD__=1" +_CFLAGS="$_ARCHEXTRA -nostdinc -nostdlib -I$_OBJ -I$_INCDIR -I$_ARCHINCDIR -D__LIBPAYLOAD__=1" if [ "$CONFIG_LP_PDCURSES" = y ]; then _CFLAGS="$_CFLAGS -I$BASE/../curses/PDCurses" @@ -167,8 +167,8 @@ else _LIBGCC=`$DEFAULT_CC $_ARCHEXTRA -print-libgcc-file-name` if [ -f $_ARCHLIBDIR/head.o ]; then HEAD_O=$_ARCHLIBDIR/head.o - elif [ -f $BASE/../build/head.o ]; then - HEAD_O=$BASE/../build/head.o + elif [ -f $_OBJ/head.o ]; then + HEAD_O=$_OBJ/head.o else echo "Could not find head.o" exit 1 -- cgit v1.2.3