major changes to improve toolchain and crossbuild concept, still in devel!

[hdw-linux/hdw-linux.git] / packages / toolchain / binutils / binutils

diff --git a/packages/toolchain/binutils/binutils b/packages/toolchain/binutils/binutils
index 08e3bc0..82ea44d 100644 (file)
--- a/packages/toolchain/binutils/binutils
+++ b/packages/toolchain/binutils/binutils
@@ -7,13 +7,11 @@
 # [D] binutils-2.15.91.0.1.tar.bz2 http://ftp.kernel.org/pub/linux/devel/binutils/
 
 if [ "$priority" = "1" ] ; then
-       confopt=${confopt//--host* /--host=$hdw_arch_build }
        confopt="$confopt --disable-nls"
        # use host system tools
        hdw_arch_prefix=""
        . ./scripts/optimization
        unset CFLAGS
-       make_conf="LDFLAGS=-all-static"
        libpath="$prefix/lib"
 fi
 
@@ -27,7 +25,7 @@ if [ "$priority" = "4" ] ; then
                rm -rf $root/tmp/src.binutils
 
                # show new linker to gcc
-               SPECFILE=$prefix/lib/gcc-lib/*/*/specs &&
+               SPECFILE="`gcc --print-file specs`" &&
                sed -e "s@/lib/ld.so.1@$prefix/lib/ld.so.1@g" \
                    -e "s@/lib/ld-linux.so.2@$prefix/lib/ld-linux.so.2@g" \
                        $SPECFILE > tempspecfile
@@ -40,23 +38,25 @@ fi
 
 if [ "$priority" = "5" ] ; then
        confopt="$confopt --enable-shared --with-lib-path=$prefix/lib"  
-       make_conf=""
-       libpath="/usr/lib:/lib"
+       if [ "$hdw_crossbuild" = "0" ] ; then
+               libpath="/usr/lib:/lib"
+       else
+               libpath="$prefix/usr/lib:$prefix/lib"
+       fi
 fi
 
 build_main()    {
        mkdir -p ../binutils-build
        cd ../binutils-build
        ../binutils-${ver}/configure $confopt &&
-       [ "$priority" = "1" ] && make configure-host
        make $make_conf &&
-       make install
+       make $install_conf install
                }
 
 post_install()  {
        # linkers default library path (where our glibc will go)
        make -C ld clean
-       make -C ld $make_conf LIB_PATH=$libpath
+       make -C ld LIB_PATH=$libpath
        # __very__ ___ugly___
        # store binutils tree to reinstall after glibc build
        cd $root && mkdir -p tmp