From 2bfdaaefd8c3ac7d680059e631d80ff27b48b4cf Mon Sep 17 00:00:00 2001 From: EnderIce2 Date: Fri, 2 Feb 2024 01:59:40 +0200 Subject: [PATCH] Fix build order in Makefile --- Makefile | 2 +- apps/Makefile | 4 ++-- apps/base/Makefile | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 92aaf5bc..1bf1b2f5 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ ifeq ($(wildcard cache/musl),) endif $(info Installing musl libc) cd cache/musl && make TARGET=$(TARGET) install - cp out/lib/crt1.o out/lib/crt0.o +# cp out/lib/crt1.o out/lib/crt0.o cd out/lib && ln -s /lib/libc.so ./ld-musl-x86_64.so.1 && \ ln -s /lib/libc.so ./ld.so mkdir -p out/include/fennix diff --git a/apps/Makefile b/apps/Makefile index 9420179a..0b124bb3 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -1,9 +1,9 @@ build: - make -C system build make -C base build + make -C system build make -C user build clean: - make -C system clean make -C base clean + make -C system clean make -C user clean diff --git a/apps/base/Makefile b/apps/base/Makefile index 05a94b0f..2db923b8 100644 --- a/apps/base/Makefile +++ b/apps/base/Makefile @@ -51,15 +51,15 @@ endif CROSS_COMPILE=$(BUSYBOX_CROSS_PATH) install build: - make -C echo build - make -C fsh build make -C utest build make -C cross_test build + make -C echo build + make -C fsh build # $(MAKE) build_busybox # $(MAKE) build_bash clean: - make -C echo clean - make -C fsh clean make -C utest clean make -C cross_test clean + make -C echo clean + make -C fsh clean