fix build

This commit is contained in:
Ella Stanforth 2022-04-20 18:03:16 +00:00
parent 8a3da42238
commit b712b661b0
2 changed files with 15 additions and 3 deletions

View File

@ -38,7 +38,9 @@ fi
SYSROOT_S1=$(pwd)/sysroot SYSROOT_S1=$(pwd)/sysroot
export CC=$(pwd)/x86_64-iglunix-linux-musl-cc.sh 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 .. cd ..
@ -70,7 +72,9 @@ echo === STAGE 2 === Build cross libs
s2_build linux musl s2_build linux musl
s2_build linux linux s2_build linux linux
s2_build base libunwind s2_build base libunwind
export CXX=$CXX_NOINCL
s2_build base libcxx s2_build base libcxx
export CXX=$CXX_INCL
echo === STAGE 2 === Assemble sysroot echo === STAGE 2 === Assemble sysroot
@ -95,17 +99,24 @@ s3_build() {
cd ../../ cd ../../
} }
s3_build linux linux #s3_build linux linux
s3_build linux musl s3_build linux musl
s3_build linux busybox s3_build linux busybox
s3_build base mksh s3_build base mksh
s3_build base toybox s3_build base toybox
s3_build base compiler-rt
s3_build base libunwind s3_build base libunwind
export CXX=$CXX_NOINCL
s3_build base libcxx s3_build base libcxx
export CXX=$CXX_INCL
s3_build base llvm s3_build base llvm
touch .autobuilt 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 # order to build packages
# #
# build stage 1 cross toolchain with stage 0: # build stage 1 cross toolchain with stage 0:

View File

@ -1,6 +1,6 @@
#!/bin/sh -e #!/bin/sh -e
cd build 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 CHROOT=$(pwd)/chroot
mkdir -p $CHROOT mkdir -p $CHROOT
@ -14,6 +14,7 @@ cex linux musl
cex linux busybox cex linux busybox
cex base mksh cex base mksh
cex base toybox cex base toybox
cex base compiler-rt
cex base libunwind cex base libunwind
cex base libcxx cex base libcxx
cex base llvm cex base llvm