From e483f6d1e61ec5c5485621e12eb9c92ac4128874 Mon Sep 17 00:00:00 2001 From: apio Date: Sun, 2 Oct 2022 12:47:50 +0200 Subject: [PATCH] Adjust build scripts to install LibC headers --- tools/build-iso.sh | 2 ++ tools/build.sh | 2 ++ tools/rebuild-iso.sh | 2 ++ tools/rebuild.sh | 2 ++ tools/setup-gcc.sh | 4 +++- 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/build-iso.sh b/tools/build-iso.sh index 3686b8f7..fb65e71a 100755 --- a/tools/build-iso.sh +++ b/tools/build-iso.sh @@ -7,6 +7,8 @@ cd $LUNA_ROOT tools/setup.sh +tools/install-headers.sh + make -j$(nproc) make install diff --git a/tools/build.sh b/tools/build.sh index 97e86c7a..1cb27981 100755 --- a/tools/build.sh +++ b/tools/build.sh @@ -7,4 +7,6 @@ cd $LUNA_ROOT tools/setup.sh +tools/install-headers.sh + make -j$(nproc) \ No newline at end of file diff --git a/tools/rebuild-iso.sh b/tools/rebuild-iso.sh index f06e31df..d2c30400 100755 --- a/tools/rebuild-iso.sh +++ b/tools/rebuild-iso.sh @@ -9,6 +9,8 @@ tools/setup.sh make clean +tools/install-headers.sh + make -j$(nproc) make install diff --git a/tools/rebuild.sh b/tools/rebuild.sh index d204e93f..a1f45456 100755 --- a/tools/rebuild.sh +++ b/tools/rebuild.sh @@ -7,6 +7,8 @@ cd $LUNA_ROOT tools/setup.sh +tools/install-headers.sh + make clean make -j$(nproc) \ No newline at end of file diff --git a/tools/setup-gcc.sh b/tools/setup-gcc.sh index dcc47376..ba87e638 100755 --- a/tools/setup-gcc.sh +++ b/tools/setup-gcc.sh @@ -10,6 +10,8 @@ then exit 1 fi +tools/install-headers.sh # install the LibC headers before building GCC + mkdir -p toolchain/tarballs mkdir -p toolchain/build @@ -23,7 +25,7 @@ echo Extracting GCC... tar xf toolchain/tarballs/gcc-$LUNA_GCC_VERSION_REQUIRED.tar.xz -C toolchain/build/ -echo Patching Binutils... +echo Patching GCC... cd toolchain