1 files changed, 19 insertions, 23 deletions
diff --git a/cross/cross-mips64el-unknown-linux-gnu-binutils/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-binutils/PKGBUILD
index 18bd86070..e30319d19 100644
--- a/cross/cross-mips64el-unknown-linux-gnu-binutils/PKGBUILD
+++ b/cross/cross-mips64el-unknown-linux-gnu-binutils/PKGBUILD
@@ -2,12 +2,12 @@
 
 _pkgname=binutils
 _target="mips64el-unknown-linux-gnu"
-_sysroot="/usr/lib/cross-${_target}"
-export PATH=${_sysroot}/bin:/usr/bin/cross/${_target}:$PATH
+# We don't add the target because it duplicates it /usr/lib/$target/$target
+_sysroot="/usr/lib"
 
 pkgname=cross-${_target}-binutils
 pkgver=2.22
-pkgrel=1
+pkgrel=6
 pkgdesc="A set of programs to assemble and manipulate binary and object files for the MIPS architecture"
 url="http://www.gnu.org/software/binutils/"
 arch=('i686' 'x86_64')
@@ -19,38 +19,34 @@ md5sums=('ee0f10756c84979622b992a4a61ea3f5')
 build() {
 	cd ${srcdir}/${_pkgname}-${pkgver}
 
-    export PATH=${_sysroot}/bin:$PATH
-	
 	./configure \
-		"--prefix=${_sysroot}" \
-		"--bindir=/usr/bin" "--program-prefix=${_target}-" \
-		"--with-sysroot=${_sysroot}" \
-		"--target=${_target}" "--build=$CHOST" "--host=$CHOST" \
-		"--disable-nls" \
-		--with-gcc --with-gnu-as --with-gnu-ld \
-		--without-included-gettext
+        --prefix=${_sysroot} \
+		--bindir=/usr/bin --program-prefix=${_target}- \
+		--target=${_target} --build=$CHOST --host=$CHOST \
+		--disable-nls \
+        --disable-werror  \
+        --disable-multilib \
+		#--with-gcc --with-gnu-as --with-gnu-ld \
+		#--without-included-gettext \
+        #--with-lib-path=${_sysroot} \
+		#--with-sysroot=${_sysroot}/${_target} \
 		
-	make all
+    make configure-host
+	make 
 }
 
 package() {
 	cd ${srcdir}/${_pkgname}-${pkgver}
 	
 	make DESTDIR=${pkgdir} install
+
+    mv ${pkgdir}/usr/lib/lib/libiberty.a ${pkgdir}${_sysroot}/${_target}/lib/
+    rm -r ${pkgdir}/usr/lib/lib
 	
-	msg "Removing duplicit files..."
+	msg "Removing duplicate files..."
 	# remove these files as they are already in the system
 	# (with native binutils)
 	rm -Rf ${pkgdir}${_sysroot}/share/{man,info}
 	# remove conflicting binaries
 	find ${pkgdir}/usr/bin/ -type f -not -name "${_target}-*" -delete
-	
-	msg "Creating out-of-path executables..."
-	# symlink executables to single directory with no-arch-prefix name
-	mkdir -p ${pkgdir}/usr/bin/cross/${_target}/;
-	cd ${pkgdir}/usr/bin/cross/${_target}/;
-	for bin in ${pkgdir}/usr/bin/${_target}-*; do
-		bbin=`basename "$bin"`;
-		ln -s "/usr/bin/${bbin}" `echo "$bbin" | sed "s#^${_target}-##"`;
-	done
 }