From b712b661b0803d3b378c739267eb0c9bc9d3e13f Mon Sep 17 00:00:00 2001
From: Ella Stanforth <ella@iglunix.org>
Date: Wed, 20 Apr 2022 18:03:16 +0000
Subject: [PATCH] fix build

---
 autobuild.sh | 15 +++++++++++++--
 chroot.sh    |  3 ++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/autobuild.sh b/autobuild.sh
index 5595424..8877e61 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -38,7 +38,9 @@ fi
 SYSROOT_S1=$(pwd)/sysroot
 
 export CC=$(pwd)/x86_64-iglunix-linux-musl-cc.sh
-export CXX=$(pwd)/x86_64-iglunix-linux-musl-c++.sh
+export CXX_INCL=$(pwd)/x86_64-iglunix-linux-musl-c++.sh
+export CXX_NOINCL=$(pwd)/x86_64-iglunix-linux-musl-c++-no-incl.sh
+export CXX=$CXX_INCL
 
 cd ..
 
@@ -70,7 +72,9 @@ echo === STAGE 2 === Build cross libs
 s2_build linux musl
 s2_build linux linux
 s2_build base libunwind
+export CXX=$CXX_NOINCL
 s2_build base libcxx
+export CXX=$CXX_INCL
 
 echo === STAGE 2 === Assemble sysroot
 
@@ -95,17 +99,24 @@ s3_build() {
 	cd ../../
 }
 
-s3_build linux linux
+#s3_build linux linux
 s3_build linux musl
 s3_build linux busybox
 s3_build base mksh
 s3_build base toybox
+s3_build base compiler-rt
 s3_build base libunwind
+export CXX=$CXX_NOINCL
 s3_build base libcxx
+export CXX=$CXX_INCL
 s3_build base llvm
 
 touch .autobuilt
 
+# TODO
+# - add wrapper scripts to use stage 2 sysroot in stage 3 instead of stage 1.
+# - get whole of base cross compiling
+
 # order to build packages
 #
 # build stage 1 cross toolchain with stage 0:
diff --git a/chroot.sh b/chroot.sh
index 51908d8..bff4456 100755
--- a/chroot.sh
+++ b/chroot.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 cd build
-[ -f iglunix/.autobuilt ] || echo "ERROR: you need to run autobuild.sh first"
+# [ -f iglunix/.autobuilt ] || echo "ERROR: you need to run autobuild.sh first"
 CHROOT=$(pwd)/chroot
 mkdir -p $CHROOT
 
@@ -14,6 +14,7 @@ cex linux musl
 cex linux busybox
 cex base mksh
 cex base toybox
+cex base compiler-rt
 cex base libunwind
 cex base libcxx
 cex base llvm