优化构建系统

2024-01-16 20:39:47 +08:00 · 2024-01-16 20:39:47 +08:00 · 85e0d52783
parent 13d933aad9
commit 85e0d52783
20 changed files with 13 additions and 13 deletions
--- a/src/include/kernel/arch/x86_64/kernel.h
+++ b/src/include/kernel/arch/x86_64/kernel.h
--- a/src/include/kernel/arch/x86_64/memm.h
+++ b/src/include/kernel/arch/x86_64/memm.h
--- a/src/include/kernel/kernel.h
+++ b/src/include/kernel/kernel.h
--- a/src/include/kernel/klog.h
+++ b/src/include/kernel/klog.h
--- a/src/include/kernel/memm.h
+++ b/src/include/kernel/memm.h
--- a/src/include/kernel/memm/allocator/raw.h
+++ b/src/include/kernel/memm/allocator/raw.h
--- a/src/include/kernel/tty.h
+++ b/src/include/kernel/tty.h
--- a/src/include/libk/bits.h
+++ b/src/include/libk/bits.h
--- a/src/include/libk/lst.h
+++ b/src/include/libk/lst.h
--- a/src/include/libk/math.h
+++ b/src/include/libk/math.h
--- a/src/include/libk/multiboot2.h
+++ b/src/include/libk/multiboot2.h
--- a/src/include/libk/multiboot2/bootinfo.h
+++ b/src/include/libk/multiboot2/bootinfo.h
--- a/src/include/libk/string.h
+++ b/src/include/libk/string.h
--- a/src/include/types.h
+++ b/src/include/types.h
--- a/src/include/utils.h
+++ b/src/include/utils.h
--- a/src/Makefile
+++ b/src/Makefile
@ -1,5 +1,6 @@
 ARCH := $(shell uname -m)
-SOURCE := $(shell pwd)/scripts
+PWD := $(shell pwd)
+SOURCE := ${PWD}/scripts
 ifeq (${ARCH},x86_64)
 	ASM = nasm
 	ASMFLAGS = -f elf64
@ -11,7 +12,7 @@ endif

 SUBOBJS = kernel/kernel.o libk/libk.o

-DEFINES = ARCH="${ARCH}" ASM="${ASM}" ASMFLAGS="${ASMFLAGS}" SOURCE="${SOURCE}"
+DEFINES = ARCH="${ARCH}" ASM="${ASM}" ASMFLAGS="${ASMFLAGS}" SOURCE="${SOURCE}" PWD="${PWD}"
 ifdef release
 	DEFINES := ${DEFINES} release=1
 endif
--- a/src/kernel/Makefile
+++ b/src/kernel/Makefile
@ -1,15 +1,17 @@
+.SUFFIXES:
+
 ################################
 # C语言环境变量

 CC = gcc
-CCFLAGS = -m64 -mcmodel=large -I ../include \
+CCFLAGS = -m64 -mcmodel=large -I ../../include \
 			-fno-stack-protector -fno-exceptions \
 			-fno-builtin -nostdinc -nostdlib
 ifdef release
 	CCFLAGS := ${CCFLAGS} -O2
 endif

-C_SRCS = main.c tty.c klog.c font.c memm.c memm_${ARCH}.c raw.c
+C_SRCS = main.c tty.c font.c memm.c memm_${ARCH}.c raw.c
 C_OBJS = ${C_SRCS:.c=.c.o}

 ################################
@ -17,9 +19,9 @@ C_OBJS = ${C_SRCS:.c=.c.o}
 ################################
 # rust语音环境变量

-RSCFLAGS = --emit=obj --target x86_64-unknown-linux-gnu --crate-type=bin
+RSCFLAGS = --emit obj --crate-type lib -L crate="${PWD}/src/"

-RS_SRCS =
+RS_SRCS = klog.rs
 RS_OBJS = ${RS_SRCS:.rs=.rs.o}

 ################################
@ -34,7 +36,7 @@ endif
 ASMFLAGS := ${ASMFLAGS}
 ASMFLAGS32 = -f elf32

-S_SRCS = entry32.s entry.s memm_${ARCH}_s.s
+S_SRCS = entry32.s entry.s memm_${ARCH}.s
 S_OBJS = ${S_SRCS:.s=.s.o}

 ################################
--- a/src/kernel/arch/x86_64/memm_x86_64_s.s
+++ b/src/kernel/arch/x86_64/memm_x86_64_s.s
--- a/src/kernel/klog/klog.c
+++ b/src/kernel/klog/klog.c
--- a/src/libk/Makefile
+++ b/src/libk/Makefile
@ -1,13 +1,10 @@
-ARCH := $(shell uname -m)
-ifdef release
-	release = 1
-endif
+.SUFFIXES:

 ################################
 # C语言环境变量

 CC = gcc
-CCFLAGS = -m64 -mcmodel=large -I ../include \
+CCFLAGS = -m64 -mcmodel=large -I ../../include \
 			-fno-stack-protector -fno-exceptions \
 			-fno-builtin -nostdinc -nostdlib
 ifdef release
@ -22,7 +19,7 @@ C_OBJS = ${C_SRCS:.c=.c.o}
 ################################
 # rust语音环境变量

-RSCFLAGS = --emit=obj --target x86_64-unknown-linux-gnu --crate-type=bin
+RSCFLAGS = --emit obj --crate-type lib -L crate="${PWD}/src/"

 RS_SRCS =
 RS_OBJS = ${RS_SRCS:.rs=.rs.o}