From 01713d684c33d3273c460f88751d033cd8d37741 Mon Sep 17 00:00:00 2001
From: Denis Benato <benato.denis96@gmail.com>
Date: Sat, 7 Dec 2024 16:29:26 +0100
Subject: [PATCH] Rebuild gcc with the new configuration and disable
 libsanitizer

---
 build.sh | 71 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 31 deletions(-)

diff --git a/build.sh b/build.sh
index b37e031..c4395b3 100755
--- a/build.sh
+++ b/build.sh
@@ -183,6 +183,7 @@ if [ ! -f "$STEPS_DIR/gcc-step1" ]; then
         --disable-libvtv              \
         --disable-libstdcxx           \
         --disable-decimal-float       \
+        --disable-libsanitizer        \
         --enable-languages=c
     make -j 32 all-gcc # if build fails add --disable-libsanitizer
     make -j 32 install-gcc
@@ -193,17 +194,17 @@ if [ ! -f "$STEPS_DIR/gcc-step1" ]; then
 fi
 
 # From now on use
-export BUILD_CC=gcc
-export CC="$LFS_TGT-gcc"
-export CXX="$LFS_TGT-g++"
-export AS="$LFS_TGT-as"
-export LD="$LFS_TGT-ld"
-export AR="$LFS_TGT-ar"
-export RANLIB="$LFS_TGT-ranlib"
-# remove hardening options for building libraries
-export CFLAGS="-U_FORTIFY_SOURCE -O2"
-export CPPFLAGS="-U_FORTIFY_SOURCE -O2"
-export LD_LIBRARY_PATH_old="$LD_LIBRARY_PATH"
+#export BUILD_CC=gcc
+#export CC="$LFS_TGT-gcc"
+#export CXX="$LFS_TGT-g++"
+#export AS="$LFS_TGT-as"
+#export LD="$LFS_TGT-ld"
+#export AR="$LFS_TGT-ar"
+#export RANLIB="$LFS_TGT-ranlib"
+## remove hardening options for building libraries
+#export CFLAGS="-U_FORTIFY_SOURCE -O2"
+#export CPPFLAGS="-U_FORTIFY_SOURCE -O2"
+#export LD_LIBRARY_PATH_old="$LD_LIBRARY_PATH"
 unset LD_LIBRARY_PATH
 
 # build glibc
@@ -287,14 +288,14 @@ if [ ! -f "$STEPS_DIR/glibc" ]; then
     touch "$STEPS_DIR/glibc"
 fi
 
-unset CC
-unset CXX
-unset LD
-unset AS
-unset AR
-unset RANLIB
-unset OBJDUMP
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH_old"
+#unset CC
+#unset CXX
+#unset LD
+#unset AS
+#unset AR
+#unset RANLIB
+#unset OBJDUMP
+#export LD_LIBRARY_PATH="$LD_LIBRARY_PATH_old"
 
 if [ ! -f "$STEPS_DIR/gcc-step2" ]; then
     #if [ ! -d "$LFS_BUILD/gcc/build" ]; then
@@ -327,26 +328,34 @@ if [ ! -f "$STEPS_DIR/gcc-step2" ]; then
         --disable-libvtv              \
         --disable-libstdcxx           \
         --disable-decimal-float       \
+        --disable-libsanitizer        \
         --enable-languages=c
 
+    # Repeat this
+    make -j 32 all-gcc
+
     make -j 32 all-target-libgcc # if build fails add --disable-libsanitizer
+
+    # Repeat this too
+    make -j 32 install-gcc
+
     make -j 32 install-target-libgcc
     cd "$BASE_DIR"
     #rm -rf "$LFS_BUILD/gcc/build" # Do not remove the whole gcc directory: we need it for libstdc++
     touch "$STEPS_DIR/gcc-step2"
 fi
-
-export CC="$LFS_TGT-gcc"
-export CXX="$LFS_TGT-g++"
-export AS="$LFS_TGT-as"
-export LD="$LFS_TGT-ld"
-export AR="$LFS_TGT-ar"
-export RANLIB="$LFS_TGT-ranlib"
-# remove hardening options for building libraries
-export CFLAGS="-U_FORTIFY_SOURCE -O2"
-export CPPFLAGS="-U_FORTIFY_SOURCE -O2"
-export LD_LIBRARY_PATH_old="$LD_LIBRARY_PATH"
-unset LD_LIBRARY_PATH
+exit 0
+#export CC="$LFS_TGT-gcc"
+#export CXX="$LFS_TGT-g++"
+#export AS="$LFS_TGT-as"
+#export LD="$LFS_TGT-ld"
+#export AR="$LFS_TGT-ar"
+#export RANLIB="$LFS_TGT-ranlib"
+## remove hardening options for building libraries
+#export CFLAGS="-U_FORTIFY_SOURCE -O2"
+#export CPPFLAGS="-U_FORTIFY_SOURCE -O2"
+#export LD_LIBRARY_PATH_old="$LD_LIBRARY_PATH"
+#unset LD_LIBRARY_PATH
 
 if [ ! -f "$STEPS_DIR/glibc-step2" ]; then
     if [ ! -d "$LFS_BUILD/glibc/build" ]; then