From 61e01cf703e7c28382619d0c9c527f8e6552256b Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 13 Jul 2011 22:04:29 +0200
Subject: [PATCH] config/optimize: dont use host libdirs in LDFLAGS, use in
 LIBDIR instead

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 config/optimize | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/config/optimize b/config/optimize
index a7853f4b68..2e1f9376ce 100644
--- a/config/optimize
+++ b/config/optimize
@@ -55,44 +55,48 @@ TARGET_CPPFLAGS=
 TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $PROJECT_CFLAGS"
 TARGET_CXXFLAGS="$TARGET_CFLAGS"
 TARGET_LDFLAGS="$TARGET_LDFLAGS $GCC_OPTIM $LD_OPTIM"
+TARGET_LIBDIR="$SYSROOT_PREFIX/lib $SYSROOT_PREFIX/usr/lib"
+TARGET_INCDIR="$SYSROOT_PREFIX/include $SYSROOT_PREFIX/usr/include"
 
 HOST_CPPFLAGS=""
 HOST_CFLAGS="-O2 -Wall -pipe -I$ROOT/$TOOLCHAIN/include"
 HOST_CXXFLAGS="$HOST_CFLAGS"
 HOST_LDFLAGS="-Wl,-rpath,$ROOT/$TOOLCHAIN/lib -L$ROOT/$TOOLCHAIN/lib"
+HOST_LIBDIR="$ROOT/$TOOLCHAIN/lib"
 
 # add distro specific library dirs
   # ubuntu/debian specific "multiarch support"
     FAMILY_TRIPLET=$(echo $HOST_NAME | sed -e "s,$(uname -m),$(uname -i),")
     if [ -d /lib/$FAMILY_TRIPLET ]; then
-      HOST_LDFLAGS="$HOST_LDFLAGS -L/lib/$FAMILY_TRIPLET"
+      HOST_LIBDIR="$HOST_LIBDIR /lib/$FAMILY_TRIPLET"
     fi
     if [ -d /usr/lib/$FAMILY_TRIPLET ]; then
-      HOST_LDFLAGS="$HOST_LDFLAGS -L/usr/lib/$FAMILY_TRIPLET"
+      HOST_LIBDIR="$HOST_LIBDIR /usr/lib/$FAMILY_TRIPLET"
     fi
 
   # default multiarch support
     case "`uname -m`" in
       i*86)
         if [ -d /lib32 ]; then
-          HOST_LDFLAGS="$HOST_LDFLAGS -L/lib32"
+          HOST_LIBDIR="$HOST_LIBDIR /lib32"
         fi
         if [ -d /usr/lib32 ]; then
-          HOST_LDFLAGS="$HOST_LDFLAGS -L/usr/lib32"
+          HOST_LIBDIR="$HOST_LIBDIR /usr/lib32"
         fi
       ;;
       x86_64)
         if [ -d /lib64 ]; then
-          HOST_LDFLAGS="$HOST_LDFLAGS -L/lib64"
+          HOST_LIBDIR="$HOST_LIBDIR /lib64"
         fi
         if [ -d /usr/lib64 ]; then
-          HOST_LDFLAGS="$HOST_LDFLAGS -L/usr/lib64"
+          HOST_LIBDIR="$HOST_LIBDIR /usr/lib64"
         fi
       ;;
     esac
 
   # default dirs
-    HOST_LDFLAGS="$HOST_LDFLAGS -L/lib -L/usr/lib"
+    HOST_LIBDIR="$HOST_LIBDIR /lib /usr/lib"
+    HOST_INCDIR="$ROOT/$TOOLCHAIN/include /usr/include"
 
 # use -fPIC when necessary
   case "`uname -m`" in