X-Git-Url: https://hackdaworld.org/gitweb/?p=hdw-linux%2Fhdw-linux.git;a=blobdiff_plain;f=packages%2Ftoolchain%2Fbinutils%2Fbinutils;fp=packages%2Ftoolchain%2Fbinutils%2Fbinutils;h=0fa39e2150aa56efdd31084693d9fe001ea500de;hp=fce7aa10082e98247ead669a5b5234aeb71b8bd2;hb=504579d0d381b02fc33fe1c696d64f96135a15a8;hpb=c7b7c7d4ce2f5a6947e42ff37d9584d26eb52ba4

diff --git a/packages/toolchain/binutils/binutils b/packages/toolchain/binutils/binutils
index fce7aa1..0fa39e2 100644
--- a/packages/toolchain/binutils/binutils
+++ b/packages/toolchain/binutils/binutils
@@ -14,18 +14,19 @@ fi
 if [ "$priority" = "4" ] ; then
 	custmain=1
 	custmain()	{
-		# install the ld linking against new libc
-		mv -v $bindir/{ld,ld-old}
+		# install the ld linking against toolchain libc
+		mv -v $prefix/bin/{ld,ld-old}
 		mv -v $prefix/`gcc -dumpmachine`/bin/{ld,ld-old}
-		mv -v $bindir/{ld-new,ld}
-		ln -sfv $bindir/ld $prefix/`gcc -dumpmachine`/bin/ld
+		mv -v $prefix/bin/{ld-new,ld}
+		ln -sfv $prefix/bin/ld $prefix/`gcc -dumpmachine`/bin/ld
 
 		# show new linker to gcc
-		SPECFILE="`gcc --print-file specs`" &&
+		SPECFILE="`gcc -print-libgcc-file-name`"
+		SPECFILE="`dirname $SPECFILE`/specs"
+		gcc -dumpspecs | 
 		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
-		mv tempspecfile $SPECFILE
+	 	    -e "s@/lib/ld-linux.so.2@$prefix/lib/ld-linux.so.2@g" > \
+			$SPECFILE
 
 		INCDIR="`dirname $SPECFILE`/include"
 		unset SPECFILE
@@ -38,7 +39,7 @@ if [ "$priority" = "4" ] ; then
 fi
 
 if [ "$priority" = "5" ] ; then
-	confopt="$confopt --enable-shared --with-lib-path=$prefix/lib"	
+	confopt="$confopt --disable-nls --with-lib-path=$prefix/lib"	
 	if [ "$hdw_crossbuild" = "0" ] ; then
 		libpath="/usr/lib:/lib"
 	else
@@ -59,5 +60,5 @@ post_install()  {
 	# (glibc will go there)
 	make -C ld clean
 	make -C ld LIB_PATH=$libpath
-	cp -v ld/ld-new $bindir
+	cp -v ld/ld-new $prefix/bin
 		}