gcc libre-testing fixes

1 files changed, 35 insertions, 27 deletions

diff --git a/libre-testing/gcc/PKGBUILD b/libre-testing/gcc/PKGBUILD
index 0991e7b04..0e55377c6 100644
--- a/libre-testing/gcc/PKGBUILD
+++ b/libre-testing/gcc/PKGBUILD
@@ -24,7 +24,15 @@ sha512sums=('1e8b826a3d44b9d5899309894e20c03abeb352bf3d273b8ad63af814c0ee2911f1a
             'SKIP'
             '680da559a37e377c494d9688577159c5c6552c38bf60986c982df8144f3ef60785d530f7223a553c8446bac0c05fd52398e946b1419fbcf511e06316a8fd2d18')
 
-_libdir="usr/lib/gcc/$CHOST/$pkgver"
+_libdir="usr/lib/gcc/$_CHOST/$pkgver"
+
+# CHOST is in the form <architecture>-<vendor>-<operatingSystem>-<cLibrary>
+# Arch currently reports CHOST with vendor "unknown".  GCC expected this until recently, when for architecture x86_64 it now expects "pc".
+_CHOST=${CHOST}
+if [[ "${CHOST}" == 'x86_64-unknown-linux-gnu' ]]; then
+  _CHOST='x86_64-pc-linux-gnu'
+fi
+
 
 prepare() {
   cd ${srcdir}/gcc-$pkgver
@@ -84,7 +92,7 @@ build() {
   make
   
   # make documentation
-  make -C $CHOST/libstdc++-v3/doc doc-man-doxygen
+  make -C $_CHOST/libstdc++-v3/doc doc-man-doxygen
 }
 
 check() {
@@ -109,7 +117,7 @@ package_gcc-libs()
 
   cd ${srcdir}/gcc-build
   
-  make -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
+  make -C $_CHOST/libgcc DESTDIR=${pkgdir} install-shared
   rm ${pkgdir}/${_libdir}/libgcc_eh.a
   
   for lib in libatomic \
@@ -122,23 +130,23 @@ package_gcc-libs()
              libsanitizer/{a,l,ub}san \
              libstdc++-v3/src \
              libvtv; do
-    make -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
+    make -C $_CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
   done
 
   [[ $CARCH == "x86_64" ]] && \
-    make -C $CHOST/libsanitizer/tsan DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
+    make -C $_CHOST/libsanitizer/tsan DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
 
-  make -C $CHOST/libobjc DESTDIR=${pkgdir} install-libs
+  make -C $_CHOST/libobjc DESTDIR=${pkgdir} install-libs
 
-  make -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
+  make -C $_CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
 
-  make -C $CHOST/libmpx DESTDIR=${pkgdir} install
+  make -C $_CHOST/libmpx DESTDIR=${pkgdir} install
   rm ${pkgdir}/usr/lib/libmpx.spec
 
   for lib in libgomp \
              libitm \
              libquadmath; do
-    make -C $CHOST/$lib DESTDIR=${pkgdir} install-info
+    make -C $_CHOST/$lib DESTDIR=${pkgdir} install-info
   done
 
   # Install Runtime Library Exception
@@ -161,13 +169,13 @@ package_gcc()
   install -m755 -t $pkgdir/usr/bin/ gcc/gcov{,-tool}
   install -m755 -t $pkgdir/${_libdir}/ gcc/{cc1,cc1plus,collect2,lto1}
 
-  make -C $CHOST/libgcc DESTDIR=${pkgdir} install
+  make -C $_CHOST/libgcc DESTDIR=${pkgdir} install
   rm ${pkgdir}/usr/lib/libgcc_s.so*
   
-  make -C $CHOST/libstdc++-v3/src DESTDIR=${pkgdir} install
-  make -C $CHOST/libstdc++-v3/include DESTDIR=${pkgdir} install
-  make -C $CHOST/libstdc++-v3/libsupc++ DESTDIR=${pkgdir} install
-  make -C $CHOST/libstdc++-v3/python DESTDIR=${pkgdir} install
+  make -C $_CHOST/libstdc++-v3/src DESTDIR=${pkgdir} install
+  make -C $_CHOST/libstdc++-v3/include DESTDIR=${pkgdir} install
+  make -C $_CHOST/libstdc++-v3/libsupc++ DESTDIR=${pkgdir} install
+  make -C $_CHOST/libstdc++-v3/python DESTDIR=${pkgdir} install
 
   make DESTDIR=${pkgdir} install-libcc1
   install -d $pkgdir/usr/share/gdb/auto-load/usr/lib
@@ -180,18 +188,18 @@ package_gcc()
   
   make -C lto-plugin DESTDIR=${pkgdir} install
   install -dm755 ${pkgdir}/usr/lib/bfd-plugins/
-  ln -s /usr/lib/gcc/$CHOST/${pkgver}/liblto_plugin.so \
+  ln -s /usr/lib/gcc/$_CHOST/${pkgver}/liblto_plugin.so \
     ${pkgdir}/usr/lib/bfd-plugins/
 
-  make -C $CHOST/libcilkrts DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS \
+  make -C $_CHOST/libcilkrts DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS \
     install-nodist_cilkincludeHEADERS
-  make -C $CHOST/libgomp DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS \
+  make -C $_CHOST/libgomp DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS \
     install-nodist_libsubincludeHEADERS
-  make -C $CHOST/libitm DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
-  make -C $CHOST/libquadmath DESTDIR=${pkgdir} install-nodist_libsubincludeHEADERS
-  make -C $CHOST/libsanitizer DESTDIR=${pkgdir} install-nodist_{saninclude,toolexeclib}HEADERS
-  make -C $CHOST/libsanitizer/asan DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
-  make -C $CHOST/libmpx DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
+  make -C $_CHOST/libitm DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
+  make -C $_CHOST/libquadmath DESTDIR=${pkgdir} install-nodist_libsubincludeHEADERS
+  make -C $_CHOST/libsanitizer DESTDIR=${pkgdir} install-nodist_{saninclude,toolexeclib}HEADERS
+  make -C $_CHOST/libsanitizer/asan DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
+  make -C $_CHOST/libmpx DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
 
   make -C libiberty DESTDIR=${pkgdir} install
   # install PIC version of libiberty
@@ -237,7 +245,7 @@ EOF
   chmod 755 $pkgdir/usr/bin/c{8,9}9
 
   # install the libstdc++ man pages
-  make -C $CHOST/libstdc++-v3/doc DESTDIR=$pkgdir doc-install-man
+  make -C $_CHOST/libstdc++-v3/doc DESTDIR=$pkgdir doc-install-man
 
   # Install Runtime Library Exception
   install -d ${pkgdir}/usr/share/licenses/gcc/
@@ -251,9 +259,9 @@ package_gcc-fortran()
   options=('!emptydirs')
 
   cd ${srcdir}/gcc-build
-  make -C $CHOST/libgfortran DESTDIR=$pkgdir install-cafexeclibLTLIBRARIES \
+  make -C $_CHOST/libgfortran DESTDIR=$pkgdir install-cafexeclibLTLIBRARIES \
     install-{toolexeclibDATA,nodist_fincludeHEADERS}
-  make -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
+  make -C $_CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
   make -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
   install -Dm755 gcc/f951 $pkgdir/${_libdir}/f951
 
@@ -270,7 +278,7 @@ package_gcc-objc()
   depends=("gcc=$pkgver-$pkgrel")
 
   cd ${srcdir}/gcc-build
-  make DESTDIR=$pkgdir -C $CHOST/libobjc install-headers
+  make DESTDIR=$pkgdir -C $_CHOST/libobjc install-headers
   install -dm755 $pkgdir/${_libdir}
   install -m755 gcc/cc1obj{,plus} $pkgdir/${_libdir}/
 
@@ -310,7 +318,7 @@ package_gcc-go()
   options=('!emptydirs')
 
   cd ${srcdir}/gcc-build
-  make -C $CHOST/libgo DESTDIR=$pkgdir install-exec-am
+  make -C $_CHOST/libgo DESTDIR=$pkgdir install-exec-am
   rm ${pkgdir}/usr/lib/libgo.so*
   make -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
   install -Dm755 gcc/go1 $pkgdir/${_libdir}/go1