[coreboot] [commit] r6413 - trunk/payloads/libpayload/bin

[repository service]

Author: oxygene
Date: Tue Mar  1 08:12:08 2011
New Revision: 6413
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6413

Log:
Add lib/ to the default library path of lpgcc, so -l works

Signed-off-by: Patrick Georgi <patrick.georgi at secunet.com>
Acked-by: Stefan Reinauer <stefan.reinauer at coreboot.org>

Modified:
   trunk/payloads/libpayload/bin/lpgcc

Modified: trunk/payloads/libpayload/bin/lpgcc
==============================================================================
--- trunk/payloads/libpayload/bin/lpgcc	Mon Feb 28 19:09:58 2011	(r6412)
+++ trunk/payloads/libpayload/bin/lpgcc	Tue Mar  1 08:12:08 2011	(r6413)
@@ -123,7 +123,7 @@
 
 _CFLAGS="$_CFLAGS -I`$DEFAULT_CC -m32 -print-search-dirs | head -n 1 | cut -d' ' -f2`include"
 
-_LDFLAGS="$_LDSCRIPT -static"
+_LDFLAGS="-L$BASE/../lib $_LDSCRIPT -static"
 
 if [ $DOLINK -eq 0 ]; then
     if [ $DEBUGME -eq 1 ]; then
@@ -134,7 +134,7 @@
 else
     _LIBGCC=`$DEFAULT_CC -m32 -print-libgcc-file-name`
     if [ $DEBUGME -eq 1 ]; then
-	echo "$DEFAULT_CC $_CFLAGS $_LDFLAGS $_ARCHLIBDIR/head.o $CMDLINE $_LIBDIR/libpayload.a $_LIBGCC"
+	echo "$DEFAULT_CC $_CFLAGS $_LDFLAGS $_ARCHLIBDIR/head.o $CMDLINE -lpayload $_LIBGCC"
     fi
 
     # Note: $_ARCHLIBDIR/head.o must be the first object being linked, because it
@@ -142,5 +142,5 @@
     # header to be placed below 0x2000 in the resulting image.  See:
     # http://www.gnu.org/software/grub/manual/multiboot/html_node/OS-image-format.html
 
-    $DEFAULT_CC $_CFLAGS $_LDFLAGS $_ARCHLIBDIR/head.o  $CMDLINE $_LIBDIR/libpayload.a $_LIBGCC
+    $DEFAULT_CC $_CFLAGS $_LDFLAGS $_ARCHLIBDIR/head.o  $CMDLINE -lpayload $_LIBGCC
 fi