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

[Konstantin Gizdov]

    Date: Thursday, June 11, 2020 @ 14:28:53
  Author: kgizdov
Revision: 642035

successful build

Modified:
  gcc9/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-11 13:55:28 UTC (rev 642034)
+++ PKGBUILD	2020-06-11 14:28:53 UTC (rev 642035)
@@ -123,7 +123,7 @@
 
   cd gcc-build
   make -C $CHOST/libgcc DESTDIR="$pkgdir" install-shared
-  mv "${pkgdir}/usr/${_libdir}"/../lib "${pkgdir}/usr/${_libdir}"
+  mv "${pkgdir}/${_libdir}"/../lib/* "${pkgdir}/${_libdir}"
   rmdir "${pkgdir}/${_libdir}"/../lib
   rm -f "$pkgdir/$_libdir/libgcc_eh.a"
 
@@ -145,7 +145,7 @@
     "$pkgdir/usr/share/licenses/${pkgname}/RUNTIME.LIBRARY.EXCEPTION"
 
   # remove conflicting files
-  rmdir "${pkgdir}"/usr/share/locale
+  rm -rf "${pkgdir}"/usr/share/locale
 }
 
 package_gcc9() {
@@ -162,7 +162,7 @@
   install -m755 -t "$pkgdir/${_libdir}/" gcc/{cc1,cc1plus,collect2,lto1,gcov{,-tool}}
 
   make -C $CHOST/libgcc DESTDIR="$pkgdir" install
-  rmdir "${pkgdir}/${_libdir}"/../lib  
+  rm -rf "${pkgdir}/${_libdir}"/../lib
 
   make -C $CHOST/libstdc++-v3/src DESTDIR="$pkgdir" install
   make -C $CHOST/libstdc++-v3/include DESTDIR="$pkgdir" install