From 5429e26b9c5ccf36ee520a03a7d34454be03acc0 Mon Sep 17 00:00:00 2001
From: Stefan Reinauer <stepan@coresystems.de>
Date: Tue, 26 May 2009 18:01:53 +0000
Subject: Tell lpgcc about the target architecture directory. This slipped
 through since FILO does not use lpgcc (yet)

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4310 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---
 payloads/libpayload/bin/lpgcc | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'payloads')

diff --git a/payloads/libpayload/bin/lpgcc b/payloads/libpayload/bin/lpgcc
index cbc52c12e6..e88c74fc22 100755
--- a/payloads/libpayload/bin/lpgcc
+++ b/payloads/libpayload/bin/lpgcc
@@ -48,6 +48,9 @@ BASE=`dirname $0`
 # This will set the _LIBDIR and _INCDIR variables used below
 . $BASE/lp.functions
 
+# include libpayload config
+. $BASE/../libpayload.config
+
 _LDSCRIPT="-Wl,-T,$_LIBDIR/libpayload.ldscript"
 
 trygccoption() {
@@ -97,7 +100,15 @@ while [ $# -gt 0 ]; do
 	shift
 done
 
-_CFLAGS="-m32 -nostdinc -nostdlib -I$_INCDIR"
+if [ "$CONFIG_TARGET_I386" = "y" ]; then
+  _ARCHINCDIR=$_INCDIR/i386
+fi
+
+if [ "$CONFIG_TARGET_POWERPC" = "y" ]; then
+  _ARCHINCDIR=$_INCDIR/powerpc
+fi
+
+_CFLAGS="-m32 -nostdinc -nostdlib -I$_INCDIR -I$_ARCHINCDIR"
 
 # Check for the -fno-stack-protector silliness
 
-- 
cgit v1.2.3