From fbfc078e9f44c1c1e95c9c484f1d5650bcf631b7 Mon Sep 17 00:00:00 2001 From: Benji Dial Date: Sat, 27 Jul 2024 16:57:39 -0400 Subject: lots and lots of userspace stuff --- euler/makefile | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'euler/makefile') diff --git a/euler/makefile b/euler/makefile index 1767d75..62716f6 100644 --- a/euler/makefile +++ b/euler/makefile @@ -1,7 +1,6 @@ -LIBSTDCPP_SOURCES = euler/stream.cpp strings/strlen.cpp euler/syscall.asm \ - euler/entry.cpp io/fopen.cpp euler/gcc.asm memory/delete.cpp euler/heap.cpp \ - memory/new.cpp io/fclose.cpp io/fread.cpp strings/memcpy.cpp io/fseek.cpp \ - euler/start_process.cpp +LIBC_SOURCES = \ + entry.cpp std/string.cpp std/cstring.cpp syscall.cpp std/cstdlib.cpp \ + heap.cpp syscall.asm std/cctype.cpp std/cstdio.cpp stream.cpp clean: rm -rf build @@ -12,12 +11,12 @@ build/%.asm.o: source/%.asm build/%.cpp.o: source/%.cpp @mkdir -p $(@D) - $(HILBERT_CC) -c $^ -o $@ + $(HILBERT_CC) -ffreestanding -c $^ -o $@ build/crt0.o: build/empty.asm.o cp $^ $@ -build/libc.a: build/empty.asm.o +build/libc.a: ${LIBC_SOURCES:%=build/%.o} $(HILBERT_AR) rcs $@ $^ build/libg.a: build/empty.asm.o @@ -25,6 +24,3 @@ build/libg.a: build/empty.asm.o build/libm.a: build/empty.asm.o $(HILBERT_AR) rcs $@ $^ - -build/libstdc++.a: ${LIBSTDCPP_SOURCES:%=build/%.o} - $(HILBERT_AR) rcs $@ $^ -- cgit v1.2.3