From 5ffda2c51284b9e8146d8412418ea40e01f3ebc0 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Fri, 12 Jul 2019 10:22:13 +0300
Subject: [PATCH] gcc: Attempt to fix build.

---
 core/gcc/build   | 13 ++++++++++---
 core/gcc/version |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/core/gcc/build b/core/gcc/build
index 096a5a8d..e6920259 100755
--- a/core/gcc/build
+++ b/core/gcc/build
@@ -7,8 +7,12 @@ cd gcc-build
 export libat_cv_have_ifunc=no
 machine=$(gcc -dumpmachine)
 
+# Unset CFLAGS/CXXFLAGS to make 'gcc' build as generic.
+unset CFLAGS CXXFLAGS
+
 ../gcc/configure \
     --prefix=/usr \
+    --disable-bootstrap \
     --disable-multilib \
     --disable-symvers \
     --disable-libmpx \
@@ -29,13 +33,16 @@ machine=$(gcc -dumpmachine)
     --enable-threads \
     --enable-tls \
     --enable-languages=c,c++ \
-    --build="$machine" \
-    --target="$machine" \
-    --host="$machine"
+    --build="$machine"
 
 make BOOT_CFLAGS='-O'
 make DESTDIR="$1" install
 
+# Save 35MB.
+find "$1" -name libgtkpeer.a  -delete
+find "$1" -name libgjsmalsa.a -delete
+find "$1" -name libgij.a      -delete
+
 # Remove all info files.
 rm -rf "$1/usr/share/info"
 
diff --git a/core/gcc/version b/core/gcc/version
index f6e1c249..50a7e0bb 100644
--- a/core/gcc/version
+++ b/core/gcc/version
@@ -1 +1 @@
-9.1.0 1
+9.1.0 2