From d7d9eae4e8b09380e9b9ce09846c4e660ef75e97 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Mon, 11 May 2020 10:15:00 +0300
Subject: [PATCH] gcc: Skip bootstrap if we are able

---
 core/gcc/build | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/core/gcc/build b/core/gcc/build
index 276fcc18..5996c5d5 100755
--- a/core/gcc/build
+++ b/core/gcc/build
@@ -12,6 +12,16 @@ sed -i 's/lib64/lib/'       gcc/gcc/config/i386/linux64.h
 mkdir -p gcc-build
 cd gcc-build
 
+# Grab the system's GCC version.
+IFS=. read -r gcc_version _ 2>/dev/null \
+    < "$KISS_ROOT/var/db/kiss/installed/gcc/version"
+
+# Skip the bootstrap process if we are able.
+case $gcc_version in 10)
+    printf '%s\n' "Minor version difference, disabling bootstrap."
+    bootstrap=--disable-bootstrap
+esac
+
 export libat_cv_have_ifunc=no
 
 ../gcc/configure \
@@ -38,7 +48,8 @@ export libat_cv_have_ifunc=no
     --enable-languages=c,c++ \
     --without-included-gettext \
     --with-system-zlib \
-    --build=x86_64-pc-linux-musl
+    --build=x86_64-pc-linux-musl \
+    "${bootstrap:---enable-bootstrap}"
 
 make
 make DESTDIR="$1" install