From 0ae284b23b2036a32178fa39e3fdb752a00349b1 Mon Sep 17 00:00:00 2001
From: Giacomo Tesio <giacomo@tesio.it>
Date: Thu, 12 Dec 2019 01:05:29 +0100
Subject: [PATCH] gcc cross compiler: copy GCC headers into $JEHANNE/posix;
 reconfigure patched gcc/libstdc++-v3

---
 cross/init.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/cross/init.sh b/cross/init.sh
index 6219482..328754b 100755
--- a/cross/init.sh
+++ b/cross/init.sh
@@ -102,7 +102,7 @@ mkdir -p $BINUTILS_BUILD_DIR
 failOnError $? "Building binutils"
 echo done.
 
-echo -n Building gcc... | tee -a $WORKING_DIR/gcc.build.log
+echo -n Building gcc... | tee -a $LOG
 # Patch and build gcc
 export GCC_BUILD_DIR=$WORKING_DIR/build/gcc
 mkdir -p $GCC_BUILD_DIR
@@ -115,7 +115,7 @@ export CPATH="$WORKING_DIR/cross/posix/lib/gcc/x86_64-jehanne/9.2.0/include:$WOR
 	sed -i 's/ftp/https/g' src/gcc/contrib/download_prerequisites &&
 	cd src &&
 	( cd gcc && ./contrib/download_prerequisites ) &&
-#	( cd gcc/libstdc++-v3 && autoconf -i ) &&
+	( cd gcc/libstdc++-v3 && autoconf -i ) &&
 	cd $GCC_BUILD_DIR &&
 	$WORKING_DIR/src/gcc/configure --target=x86_64-jehanne --prefix=/posix/ --with-sysroot=$JEHANNE --enable-languages=c,c++ &&
 	make all-gcc all-target-libgcc && 
@@ -129,5 +129,10 @@ export CPATH="$WORKING_DIR/cross/posix/lib/gcc/x86_64-jehanne/9.2.0/include:$WOR
 #	make MAKEINFO=true MAKEINFOHTML=true TEXI2DVI=true TEXI2PDF=true DVIPS=true install-target-libstdc++-v3
 ) >> $LOG 2>&1
 failOnError $? "building gcc"
-
+echo done.
+
+echo -n Copying GCC includes into $JEHANNE/posix
+mkdir -p $JEHANNE/posix/lib
+cp -fpr $WORKING_DIR/cross/posix/lib/* $JEHANNE/posix/lib
+cp -fpr $WORKING_DIR/cross/posix/lib/gcc/x86_64-jehanne/9.2.0/include-fixed/* $JEHANNE/posix/lib/gcc/x86_64-jehanne/9.2.0/include/
 echo done.