gcc: fixed some merging errors

1 files changed, 15 insertions, 9 deletions

diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index c2d3d3650..7022eb0b5 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -85,6 +85,8 @@ build() {
 
   if [[ "${CARCH}" != "mips64el" ]]; then
       languages=c,c++,ada,fortran,go,lto,objc,obj-c++
+# ancient mips abi doesn't support gnu.hash yet
+      extra="--with-linker-hash-style=gnu"
   else
       languages=c,c++,fortran,lto,objc,obj-c++
   fi
@@ -101,7 +103,7 @@ build() {
       --enable-gnu-unique-object --enable-linker-build-id \
       --enable-cloog-backend=isl --disable-cloog-version-check \
       --enable-lto --enable-plugin --enable-install-libiberty \
-      --with-linker-hash-style=gnu \
+      $extra \
       --disable-multilib --disable-werror \
       --enable-checking=release
   make
@@ -136,7 +138,7 @@ package_gcc-libs()
   cd ${srcdir}/gcc-build
   
   make -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
-  rm ${pkgdir}/${_libdir}/libgcc_eh.a
+  rm -f ${pkgdir}/${_libdir}/libgcc_eh.a
   
   for lib in libmudflap \
              libgomp \
@@ -148,7 +150,7 @@ package_gcc-libs()
              libsanitizer/asan; do
     # Skip libitm and asan on mips64el
     test "$CARCH" = "mips64el" &&
-    echo "$lib" | grep -q "libitm libsanitizer/asan" &&
+    echo "libitm libsanitizer/asan" | grep -q "$lib" &&
     continue
     make -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
   done
@@ -190,7 +192,7 @@ package_gcc()
   install -m755 -t $pkgdir/${_libdir}/ gcc/{cc1,cc1plus,collect2,lto1}
 
   make -C $CHOST/libgcc DESTDIR=${pkgdir} install
-  rm ${pkgdir}/usr/lib/libgcc_s.so*
+  rm -f ${pkgdir}/usr/lib/libgcc_s.so*
   
   make -C $CHOST/libstdc++-v3/src DESTDIR=${pkgdir} install
   make -C $CHOST/libstdc++-v3/include DESTDIR=${pkgdir} install
@@ -200,7 +202,7 @@ package_gcc()
   install -d $pkgdir/usr/share/gdb/auto-load/usr/lib
   mv $pkgdir/usr/lib/libstdc++.so.6.*-gdb.py \
     $pkgdir/usr/share/gdb/auto-load/usr/lib/
-  rm ${pkgdir}/usr/lib/libstdc++.so*
+  rm -f ${pkgdir}/usr/lib/libstdc++.so*
 
   make DESTDIR=${pkgdir} install-fixincludes
   make -C gcc DESTDIR=${pkgdir} install-mkheaders
@@ -208,16 +210,20 @@ package_gcc()
 
   make -C $CHOST/libgomp DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS \
     install-nodist_libsubincludeHEADERS
+# itm not available in mips
+  test "$CARCH" != "mips64el" &&
   make -C $CHOST/libitm DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
   make -C $CHOST/libmudflap DESTDIR=${pkgdir} install-nobase_libsubincludeHEADERS
   make -C $CHOST/libquadmath DESTDIR=${pkgdir} install-nodist_libsubincludeHEADERS
+# asan not available in mips
+  test "$CARCH" != "mips64el" &&
   make -C $CHOST/libsanitizer/asan DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
 
   make -C libiberty DESTDIR=${pkgdir} install
 
   make -C gcc DESTDIR=${pkgdir} install-man install-info
-  rm ${pkgdir}/usr/share/man/man1/{gccgo,gfortran}.1
-  rm ${pkgdir}/usr/share/info/{gccgo,gfortran,gnat-style,gnat_rm,gnat_ugn}.info
+  rm -f ${pkgdir}/usr/share/man/man1/{gccgo,gfortran}.1
+  rm -f ${pkgdir}/usr/share/info/{gccgo,gfortran,gnat-style,gnat_rm,gnat_ugn}.info
 
   make -C libcpp DESTDIR=${pkgdir} install
   make -C gcc DESTDIR=${pkgdir} install-po
@@ -314,7 +320,7 @@ package_gcc-ada()
   mv ${pkgdir}/${_libdir}/adalib/libgna{rl,t}-${_pkgver}.so ${pkgdir}/usr/lib
   ln -s libgnarl-${_pkgver}.so ${pkgdir}/usr/lib/libgnarl.so
   ln -s libgnat-${_pkgver}.so ${pkgdir}/usr/lib/libgnat.so
-  rm ${pkgdir}/${_libdir}/adalib/libgna{rl,t}.*
+  rm -f ${pkgdir}/${_libdir}/adalib/libgna{rl,t}.*
 
   # Install Runtime Library Exception
   install -d ${pkgdir}/usr/share/licenses/gcc-ada/
@@ -333,7 +339,7 @@ package_gcc-go()
   make -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
   install -Dm755 gcc/go1 $pkgdir/${_libdir}/go1
 
-  rm $pkgdir/usr/lib/libgo.a
+  rm -f $pkgdir/usr/lib/libgo.a
 
   # Install Runtime Library Exception
   install -d ${pkgdir}/usr/share/licenses/gcc-go/