summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Moffett <ian@osmora.org>2024-03-08 11:21:07 -0500
committerIan Moffett <ian@osmora.org>2024-03-08 11:21:07 -0500
commitd8dd7ab232cd23c38fbc5b19af6dabb903fac546 (patch)
treee5d5cd5afdaa2dd496ecb7d4fe6e25f887e36d9b
parent39ed0640f0e33b8a48ba82334de219e9fe4ed0e6 (diff)
build: Move mlibc fetching into bootstrap script
Signed-off-by: Ian Moffett <ian@osmora.org>
-rw-r--r--Makefile.in6
-rwxr-xr-xbootstrap6
2 files changed, 7 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in
index 5e99728..26ee59a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -86,11 +86,7 @@ base:
mkdir -p base/usr/sbin/
mkdir -p base/boot/
-lib: lib/mlibc base/usr/lib/ld.so
-
-lib/mlibc:
- git clone https://github.com/sigsegv7/hyra-mlibc lib/mlibc
- cp builddeps/cross_file.txt lib/mlibc/
+lib: base/usr/lib/ld.so
.PHONY: run
run:
diff --git a/bootstrap b/bootstrap
index 9c4ad77..7c36c65 100755
--- a/bootstrap
+++ b/bootstrap
@@ -16,14 +16,20 @@ try_fetch() {
fetch() {
try_fetch "git clone https://github.com/limine-bootloader/limine.git --branch=v5.x-branch-binary --depth=1" "stand/limine"
+ try_fetch "git clone https://github.com/sigsegv7/hyra-mlibc lib/mlibc"
}
build_limine() {
make -C stand/limine/
}
+init_mlibc() {
+ cp builddeps/cross_file.txt lib/mlibc/
+}
+
build() {
build_limine
+ init_mlibc
}
echo "----------------------------------"