[arch-commits] Commit in gcc/trunk (PKGBUILD)

[Allan McRae]

    Date: Sunday, May 3, 2015 @ 07:13:15
  Author: allan
Revision: 238374

new upstream snapshop + additional patches

Modified:
  gcc/trunk/PKGBUILD

----------+
 PKGBUILD |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-03 03:09:44 UTC (rev 238373)
+++ PKGBUILD	2015-05-03 05:13:15 UTC (rev 238374)
@@ -186,6 +186,7 @@
   make -C gcc DESTDIR=${pkgdir} install-mkheaders
   
   make -C lto-plugin DESTDIR=${pkgdir} install
+  install -Dm755 ${pkgdir}/usr/lib/bfd-plugins/
   ln -s /usr/lib/gcc/$CHOST/${pkgver}/liblto_plugin.so ${pkgdir}/usr/lib/bfd-plugins/
 
   make -C $CHOST/libcilkrts DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS \
@@ -312,6 +313,7 @@
 {
   pkgdesc="Go front-end for GCC"
   depends=("gcc=$pkgver-$pkgrel")
+  conflicts=('go')
   options=('!emptydirs')
   install=gcc-go.install
 
@@ -322,10 +324,6 @@
 
   make DESTDIR=${pkgdir} install-gotools
 
-  # fix conflicts with go package
-  mv ${pkgdir}/usr/bin/{,gcc-}go
-  mv ${pkgdir}/usr/bin/{,gcc-}gofmt
-
   # Install Runtime Library Exception
   install -d ${pkgdir}/usr/share/licenses/gcc-go/
   ln -s ../gcc-libs/RUNTIME.LIBRARY.EXCEPTION ${pkgdir}/usr/share/licenses/gcc-go/