From b7455c9466beac22e25a327cf920263339c9216a Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Sat, 13 Jul 2019 10:14:38 +0300
Subject: [PATCH] gcc: Try and fix build again.

---
 core/gcc/build   | 10 ++--------
 core/gcc/version |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/core/gcc/build b/core/gcc/build
index 4d2be2df..383fbbc1 100755
--- a/core/gcc/build
+++ b/core/gcc/build
@@ -5,7 +5,6 @@ mkdir -p gcc-build
 cd gcc-build
 
 export libat_cv_have_ifunc=no
-machine=$(gcc -dumpmachine)
 
 # Unset CFLAGS/CXXFLAGS to make 'gcc' build as generic.
 unset CFLAGS CXXFLAGS
@@ -13,7 +12,6 @@ unset CFLAGS CXXFLAGS
 ../gcc/configure \
     --prefix=/usr \
     --disable-bootstrap \
-    --disable-multilib \
     --disable-symvers \
     --disable-libmpx \
     --disable-libmudflap \
@@ -32,13 +30,9 @@ unset CFLAGS CXXFLAGS
     --enable-shared \
     --enable-threads \
     --enable-tls \
-    --enable-languages=c,c++ \
-    --build="$machine" \
-    --with-tune=generic \
-    --with-arch=x86-64 \
-    --with-cpu-64=generic
+    --enable-languages=c,c++
 
-make BOOT_CFLAGS='-O'
+make
 make DESTDIR="$1" install
 
 # Save 35MB.
diff --git a/core/gcc/version b/core/gcc/version
index c9eeb884..978e96bf 100644
--- a/core/gcc/version
+++ b/core/gcc/version
@@ -1 +1 @@
-9.1.0 3
+9.1.0 4