X-Git-Url: http://gitweb/?a=blobdiff_plain;f=gcc%2FPkgfile;h=fbc1ce7f889014f501240635b24abdc1bab41bc1;hb=f9fa74e48326f450fe556068833d5d71ab7b601b;hp=a733356a60c14d2d05f3615b9ef6b7e629be2733;hpb=8016236a76e05278cb2b6702c79550cc9e1ac886;p=ports%2Fcore-arm64.git

diff --git a/gcc/Pkgfile b/gcc/Pkgfile
index a733356..fbc1ce7 100644
--- a/gcc/Pkgfile
+++ b/gcc/Pkgfile
@@ -8,10 +8,11 @@ name=gcc
 version=7.3.0
 release=1
 source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-$version/$name-$version.tar.xz \
-        $name-nocheck-fixincludes.patch)
+        $name-nocheck-fixincludes.patch $name-aarch64-dirs.patch)
 
 build() {
   patch -d $name-$version -p1 -i $SRC/$name-nocheck-fixincludes.patch
+  patch -d $name-$version -p1 -i $SRC/gcc-aarch64-dirs.patch
 
   mkdir build
   cd build
@@ -26,12 +27,15 @@ build() {
                               --disable-nls \
                               --with-x=no \
                               --with-system-zlib \
+                              --enable-multilib \
+                              --enable-default-pie \
+                              --enable-default-ssp \
                               --with-pkgversion="CRUX-ARM 64b"
 
-  make
+  make bootstrap
   make -j1 DESTDIR=$PKG install
 
-  mkdir $PKG/lib
+  install -d $PKG/lib
   ln -sf ../usr/bin/cpp $PKG/lib/cpp
   ln -sf gcc $PKG/usr/bin/cc
   ln -sf g++ $PKG/usr/bin/c++
@@ -41,10 +45,10 @@ build() {
   rm -r $PKG/usr/bin/*-linux-gnu*
   rm -r $PKG/usr/lib/gcc/*/$version/{install-tools,include-fixed}
 
-  for D in lib64; do
+  for D in lib; do
     install -d -m 0755 $PKG/usr/share/gdb/auto-load/usr/${D}
     mv $PKG/usr/${D}/libstdc++.so.*-gdb.py $PKG/usr/share/gdb/auto-load/usr/${D}
   done
 
-  sed -i "s|-L$SRC[^ ]* ||g" $PKG/usr/lib64/{libstdc++.la,libsupc++.la}
+  sed -i "s|-L$SRC[^ ]* ||g" $PKG/usr/lib/{libstdc++.la,libsupc++.la}
 }