From 065d20901e076123282122f2d23dfb58d7bd6f0b Mon Sep 17 00:00:00 2001 From: "K. Lange" Date: Thu, 8 Jun 2023 08:52:32 +0900 Subject: [PATCH] kuroko: sync with upstream --- build/aarch64.mk | 2 +- build/x86_64.mk | 2 +- kuroko | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/aarch64.mk b/build/aarch64.mk index 3e4c8a4c..f3e0d395 100644 --- a/build/aarch64.mk +++ b/build/aarch64.mk @@ -66,5 +66,5 @@ debug: system BUILD_KRK=$(TOOLCHAIN)/local/bin/kuroko $(TOOLCHAIN)/local/bin/kuroko: kuroko/src/*.c mkdir -p $(TOOLCHAIN)/local/bin - cc -Ikuroko/src -DNO_RLINE -DSTATIC_ONLY -DKRK_DISABLE_THREADS -o "${TOOLCHAIN}/local/bin/kuroko" kuroko/src/*.c + cc -Ikuroko/src -DNO_RLINE -DKRK_STATIC_ONLY -DKRK_DISABLE_THREADS -o "${TOOLCHAIN}/local/bin/kuroko" kuroko/src/*.c diff --git a/build/x86_64.mk b/build/x86_64.mk index b8e26671..6868066e 100644 --- a/build/x86_64.mk +++ b/build/x86_64.mk @@ -105,7 +105,7 @@ fatbase/efi/boot/bootx64.efi: boot/efi64.so BUILD_KRK=$(TOOLCHAIN)/local/bin/kuroko $(TOOLCHAIN)/local/bin/kuroko: kuroko/src/*.c mkdir -p $(TOOLCHAIN)/local/bin - cc -Ikuroko/src -DNO_RLINE -DSTATIC_ONLY -DKRK_DISABLE_THREADS -o "${TOOLCHAIN}/local/bin/kuroko" kuroko/src/*.c + cc -Ikuroko/src -DNO_RLINE -DKRK_STATIC_ONLY -DKRK_DISABLE_THREADS -o "${TOOLCHAIN}/local/bin/kuroko" kuroko/src/*.c image.iso: cdrom/fat.img cdrom/boot.sys boot/mbr.S util/update-extents.krk | $(BUILD_KRK) xorriso -as mkisofs -R -J -c bootcat \ diff --git a/kuroko b/kuroko index cd28d829..2bc4637f 160000 --- a/kuroko +++ b/kuroko @@ -1 +1 @@ -Subproject commit cd28d829397dcec9b12a15169e39933260dc9a65 +Subproject commit 2bc4637f5c2611c805dc469e726669a5950a5d05