From 2625fd044547c7e8b8de287963ba9422aff1f051 Mon Sep 17 00:00:00 2001 From: Tianhao Wang Date: Sat, 11 Mar 2023 00:39:38 +0100 Subject: fix linking --- Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7a10efb..1302d9b 100644 --- a/Makefile +++ b/Makefile @@ -10,10 +10,15 @@ bootdisk.iso : kernel grub-mkrescue /usr/lib/grub/i386-pc -o bootdisk.iso isofiles kernel : rust_kernel startup.o - ld -static -e startup -T sections -o ./kernel startup.o target/x86_64_rustubs/debug/librustubs.rlib + # ar -rcs ./target/x86_64_rustubs/debug/librustubs.a ./target/x86_64-rustubs/debug/librustubs.rlib + # ld -n --gc-sections -T sections -o kernel startup.o target/x86_64-rustubs/debug/librustubs.a + ld -static -e startup -T sections -o ./kernel startup.o target/x86_64-rustubs/debug/librustubs.a rust_kernel: - cargo rustc --target=x86_64_rustubs.json -- -C link-arg=-nostartfiles --emit=obj + # cargo rustc --target=x86_64-rustubs.json -- -C link-arg=-nostartfiles --emit=obj + # cargo rustc --target=x86_64-rustubs.json -- -C link-arg=-nostartfiles --crate-type=staticlib + # xargo build --target=x86_64-rustubs + cargo xbuild --target x86_64-rustubs.json startup.o: nasm -f elf64 -o startup.o src/arch/x86_64/asm/startup.s -- cgit v1.2.3-70-g09d2