From 2ea3f7e9d8d44720f3b87fffa3487614a3c6d7b7 Mon Sep 17 00:00:00 2001 From: mintsuki Date: Thu, 23 Mar 2023 01:02:58 +0100 Subject: [PATCH] build: Minor build system updates --- bootstrap | 14 ++++++-------- common/GNUmakefile | 3 ++- decompressor/GNUmakefile | 3 ++- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bootstrap b/bootstrap index a02e2a13..67791a36 100755 --- a/bootstrap +++ b/bootstrap @@ -7,16 +7,14 @@ test -z "$srcdir" && srcdir=. cd "$srcdir" -[ -d common/term ] || git clone https://github.com/limine-bootloader/terminal.git common/term +[ -d common/term ] || git clone https://github.com/limine-bootloader/terminal.git common/term --depth=1 [ -f common/stb/stb_image.h ] || ( curl -Lo common/stb/stb_image.h https://github.com/nothings/stb/raw/master/stb_image.h && patch -p0 < common/stb_image.patch ) [ -f freestanding-toolchain ] || ( curl -Lo freestanding-toolchain https://github.com/mintsuki/freestanding-toolchain/raw/trunk/freestanding-toolchain && chmod +x freestanding-toolchain ) -[ -d freestanding-headers ] || git clone https://github.com/mintsuki/freestanding-headers.git -[ -d limine-efi ] || git clone https://github.com/limine-bootloader/limine-efi.git -[ -d libgcc-binaries ] || git clone https://github.com/mintsuki/libgcc-binaries.git - -automake_libdir="$(automake --print-libdir)" +[ -d freestanding-headers ] || git clone https://github.com/mintsuki/freestanding-headers.git --depth=1 +[ -d limine-efi ] || git clone https://github.com/limine-bootloader/limine-efi.git --depth=1 +[ -d libgcc-binaries ] || git clone https://github.com/mintsuki/libgcc-binaries.git --depth=1 mkdir -p build-aux -cp "${automake_libdir}/install-sh" build-aux +cp "$(automake --print-libdir)/install-sh" build-aux -autoreconf -fvi +autoreconf -fvi -Wall diff --git a/common/GNUmakefile b/common/GNUmakefile index dfe02281..67b3f53f 100644 --- a/common/GNUmakefile +++ b/common/GNUmakefile @@ -62,7 +62,8 @@ override CPPFLAGS_FOR_TARGET := \ $(CPPFLAGS_FOR_TARGET) \ -DCOM_OUTPUT=$(COM_OUTPUT) \ -DE9_OUTPUT=$(E9_OUTPUT) \ - -MMD + -MMD \ + -MP ifeq ($(TARGET),bios) override CFLAGS_FOR_TARGET += \ diff --git a/decompressor/GNUmakefile b/decompressor/GNUmakefile index 96709fd4..e295ebc8 100644 --- a/decompressor/GNUmakefile +++ b/decompressor/GNUmakefile @@ -43,7 +43,8 @@ override CPPFLAGS_FOR_TARGET := \ -I./tinf \ -I. \ $(CPPFLAGS_FOR_TARGET) \ - -MMD + -MMD \ + -MP override LDFLAGS_FOR_TARGET += \ -m elf_i386 \