DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-20 01:46:31 +00:00
Code Issues Releases Wiki Activity

解决设置rust workspace带来的“工具链不一致”的问题 (#345)

Browse Source 
更改workflow
This commit is contained in:
LoGin
2023-08-26 21:36:13 +08:00
committed by GitHub
parent 9a367aa7eb
commit e92d022810
11 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/Makefile
View File

@ -6,4 +6,8 @@ all:
clean:
rm -f Cargo.lock
$(MAKE) -C src clean
$(MAKE) -C src clean
.PHONY: fmt
fmt:
cargo fmt --all $(FMT_CHECK)

4
kernel/src/Makefile
View File

@ -38,7 +38,7 @@ kernel_rust:
all: kernel
@echo "Linking kernel..."
$(LD) -b elf64-x86-64 -z muldefs -o kernel head.o main.o $(shell find . -name "*.o") $(ROOT_PATH)/target/x86_64-unknown-none/release/libdragonos_kernel.a -T link.lds
$(LD) -b elf64-x86-64 -z muldefs -o kernel head.o main.o $(shell find . -name "*.o") ../target/x86_64-unknown-none/release/libdragonos_kernel.a -T link.lds
# 生成kallsyms
current_dir=$(pwd)
@ -55,7 +55,7 @@ all: kernel
# 重新链接
@echo "Re-Linking kernel..."
@echo $(shell find . -name "*.o")
$(LD) -b elf64-x86-64 -z muldefs -o kernel head.o main.o $(shell find . -name "*.o") $(ROOT_PATH)/target/x86_64-unknown-none/release/libdragonos_kernel.a ./debug/kallsyms.o -T link.lds
$(LD) -b elf64-x86-64 -z muldefs -o kernel head.o main.o $(shell find . -name "*.o") ../target/x86_64-unknown-none/release/libdragonos_kernel.a ./debug/kallsyms.o -T link.lds
@echo "Generating kernel ELF file..."
# 生成内核文件
$(OBJCOPY) -I elf64-x86-64 -O elf64-x86-64 kernel ../../bin/kernel/kernel.elf