From 04f8b61a9d236fc2a70cfbd3844adf257d4d087f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= Date: Fri, 4 Mar 2022 19:32:31 +0100 Subject: [PATCH] Refactor ports builds --- Makefile | 2 +- src/libmittos/Makefile | 2 +- toolchain/build-toolchain.sh | 2 -- toolchain/{build-musl.sh => ports/musl/build.sh} | 0 toolchain/{build-uni_vga.sh => ports/uni_vga/build.sh} | 0 5 files changed, 2 insertions(+), 4 deletions(-) rename toolchain/{build-musl.sh => ports/musl/build.sh} (100%) rename toolchain/{build-uni_vga.sh => ports/uni_vga/build.sh} (100%) diff --git a/Makefile b/Makefile index d14ddab..ac3a63d 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ endif musllib: $(SYSROOT)/usr/lib/libc.a $(SYSROOT)/usr/lib/libc.a: - ${BUILDROOT}/toolchain/build-musl.sh + $(BUILDROOT)/toolchain/ports/musl/build.sh libmittos: $(SYSROOT)/usr/lib/libmittos.a $(SYSROOT)/usr/lib/libmittos.a: FORCE diff --git a/src/libmittos/Makefile b/src/libmittos/Makefile index 2b2bc16..d674035 100644 --- a/src/libmittos/Makefile +++ b/src/libmittos/Makefile @@ -19,7 +19,7 @@ libmittos.a: $(OBJ) graphics/graphics.o: graphics/u_vga16.termfont.inc graphics/u_vga16.termfont.inc: - ${BUILDROOT}/toolchain/build-uni_vga.sh + ${BUILDROOT}/toolchain/ports/uni_vga/build.sh # Automatic dependency tracking DEP := $(OBJ:.o=.d) diff --git a/toolchain/build-toolchain.sh b/toolchain/build-toolchain.sh index c33ac81..953fbdb 100755 --- a/toolchain/build-toolchain.sh +++ b/toolchain/build-toolchain.sh @@ -58,7 +58,5 @@ mkdir gcc-build && cd gcc-build make all-gcc all-target-libgcc -j 4 make install-gcc install-target-libgcc -apk del build-base - cd / rm -rf /opt \ No newline at end of file diff --git a/toolchain/build-musl.sh b/toolchain/ports/musl/build.sh similarity index 100% rename from toolchain/build-musl.sh rename to toolchain/ports/musl/build.sh diff --git a/toolchain/build-uni_vga.sh b/toolchain/ports/uni_vga/build.sh similarity index 100% rename from toolchain/build-uni_vga.sh rename to toolchain/ports/uni_vga/build.sh