From 900ffd78324ebe827db10c65501b2839bb7b9928 Mon Sep 17 00:00:00 2001
From: Flavio Cruz <flaviocruz@gmail.com>
Date: Sun, 22 Dec 2024 21:03:26 -0500
Subject: [PATCH] Fix issue with DISABLE_ADA check and make sure compile.sh
 also uses it for consistency

---
 bootstrap-funcs.sh |  2 +-
 compile.sh         | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/bootstrap-funcs.sh b/bootstrap-funcs.sh
index 8dbb2b90..60423154 100644
--- a/bootstrap-funcs.sh
+++ b/bootstrap-funcs.sh
@@ -157,7 +157,7 @@ compile_first_glibc() {
 
 compile_full_gcc() {
   local ada="ada"
-  if [ -n $DISABLE_ADA ]; then
+  if [ -n "$DISABLE_ADA" ]; then
     ada=""
   fi
   print_info "Cross compiling GCC"
diff --git a/compile.sh b/compile.sh
index 2faf2968..0d049c76 100755
--- a/compile.sh
+++ b/compile.sh
@@ -523,6 +523,10 @@ install_mpc() {
 }
 
 install_gcc() {
+  local ada="ada"
+  if [ -n "$DISABLE_ADA" ]; then
+    ada=""
+  fi
   print_info "Compiling GCC"
   cp -R $SOURCE/$GCC_SRC $GCC_SRC.compiler
   cd $GCC_SRC.compiler &&
@@ -542,17 +546,17 @@ install_gcc() {
       --disable-bootstrap \
       --with-local-prefix="$SYS_ROOT" \
       --disable-nls \
-      --enable-languages=c,c++,ada \
+      --enable-languages=c,c++,$ada \
       --disable-libstdcxx-pch \
       --with-system-zlib \
       --with-native-system-header-dir="$SYS_ROOT/include" \
       --enable-checking=release \
       --disable-libcilkrts \
-      --disable-libssp
-  cp -v Makefile{,.orig} &&
+      --disable-libssp &&
+    cp -v Makefile{,.orig} &&
     sed "/^HOST_\(GMP\|ISL\|CLOOG\)\(LIBS\|INC\)/s:$SYS_ROOT:$CROSS_TOOLS:g" \
-      Makefile.orig >Makefile
-  make -j$PROCS AS_FOR_TARGET="$AS" LD_FOR_TARGET="$LD" all &&
+      Makefile.orig >Makefile &&
+    make -j$PROCS AS_FOR_TARGET="$AS" LD_FOR_TARGET="$LD" all &&
     make -j$PROCS install &&
     cd ..
 }