[coreboot-gerrit] Change in coreboot[master]: libpayload/lpgcc: Set proper include paths for in-tree builds

[Nico Huber (Code Review)]

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47631 )

Change subject: libpayload/lpgcc: Set proper include paths for in-tree builds
......................................................................

libpayload/lpgcc: Set proper include paths for in-tree builds

Change-Id: Idd29ef33065033e26ba61b09d412d8ca3566d643
Signed-off-by: Nico Huber 
---
M payloads/libpayload/bin/lpgcc
1 file changed, 11 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/31/47631/1

diff --git a/payloads/libpayload/bin/lpgcc b/payloads/libpayload/bin/lpgcc
index fa16149..cff9fe0 100755
--- a/payloads/libpayload/bin/lpgcc
+++ b/payloads/libpayload/bin/lpgcc
@@ -143,14 +143,19 @@
    shift
 done

-_CFLAGS="$_ARCHEXTRA -nostdinc -nostdlib -I$_OBJ -I$_INCDIR -I$_ARCHINCDIR -D__LIBPAYLOAD__=1"
+_CFLAGS="$_ARCHEXTRA -nostdinc -nostdlib -I$_INCDIR -I$_ARCHINCDIR -D__LIBPAYLOAD__=1"

-if [ "$CONFIG_LP_PDCURSES" = y ]; then
-  _CFLAGS="$_CFLAGS -I$BASE/../curses/PDCurses"
-fi
+if [ $_LIBDIR = $_OBJ ]; then
+    _CFLAGS="$_CFLAGS -I$_OBJ"

-if [ "$CONFIG_LP_TINYCURSES" = y ]; then
-  _CFLAGS="$_CFLAGS -I$BASE/../curses"
+    if [ "$CONFIG_LP_PDCURSES" = y ]; then
+	_CFLAGS="$_CFLAGS -I$BASE/../curses/PDCurses -I$BASE/../curses/pdcurses-backend"
+	_CFLAGS="$_CFLAGS -I$BASE/../curses/form -I$BASE/../curses/menu"
+    fi
+
+    if [ "$CONFIG_LP_TINYCURSES" = y ]; then
+	_CFLAGS="$_CFLAGS -I$BASE/../curses"
+    fi
 fi

# Check for the -fno-stack-protector silliness