[coreboot] [v2] r4310 - trunk/payloads/libpayload/bin

[svn at coreboot.org]

Author: stepan
Date: 2009-05-26 20:01:53 +0200 (Tue, 26 May 2009)
New Revision: 4310

Modified:
   trunk/payloads/libpayload/bin/lpgcc
Log:
Tell lpgcc about the target architecture directory. This slipped through since
FILO does not use lpgcc (yet)

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


Modified: trunk/payloads/libpayload/bin/lpgcc
===================================================================
--- trunk/payloads/libpayload/bin/lpgcc	2009-05-26 14:49:59 UTC (rev 4309)
+++ trunk/payloads/libpayload/bin/lpgcc	2009-05-26 18:01:53 UTC (rev 4310)
@@ -48,6 +48,9 @@
 # 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,8 +100,16 @@
 	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
 
 trygccoption -fno-stack-protector