From 225ea67c6478a5cedae62e4e37f16d170cdfe36a Mon Sep 17 00:00:00 2001 From: Benji Dial Date: Fri, 2 Jan 2026 23:13:16 -0500 Subject: [PATCH] disable bump allocator in flanterm --- make-build.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/make-build.sh b/make-build.sh index 126013b..302157e 100644 --- a/make-build.sh +++ b/make-build.sh @@ -20,6 +20,8 @@ KERNEL_CC_FLAGS="-mno-sse -I dependencies/limine ${COMMON_CC_FLAGS}" #in the future user code will be allowed to use sse USER_CC_FLAGS="-mno-sse -I dependencies/flanterm/src ${COMMON_CC_FLAGS}" +FLANTERM_CC_FLAGS="-D FLANTERM_FB_DISABLE_BUMP_ALLOC ${USER_CC_FLAGS}" + if [ -e build.ninja ]; then echo build.ninja already exists. exit @@ -38,6 +40,10 @@ echo "rule user_cc" >> build.ninja echo " depfile = \$out.d" >> build.ninja echo " command = cc -c -MD -MF \$out.d ${USER_CC_FLAGS} \$in -o \$out" >> build.ninja +echo "rule flanterm_cc" >> build.ninja +echo " depfile = \$out.d" >> build.ninja +echo " command = cc -c -MD -MF \$out.d ${FLANTERM_CC_FLAGS} \$in -o \$out" >> build.ninja + echo "rule kernel_ld" >> build.ninja echo " command = ld ${COMMON_LD_FLAGS} -T src/kernel/link.ld \$in -o \$out" >> build.ninja @@ -82,7 +88,7 @@ objects="" for file in flanterm.c flanterm_backends/fb.c; do src="dependencies/flanterm/src/$file" build="build/user-libs/flanterm/$file.o" - echo "build $build: user_cc $src" >> build.ninja + echo "build $build: flanterm_cc $src" >> build.ninja objects="$objects $build" done echo "build build/user-libs/flanterm/libflanterm.o: user_lib_ld $objects" >> build.ninja