fix: os now linked with the correct output

Mrgoblings · Nov 8, 2024 · 804f126 · 804f126
1 parent d60f745
commit 804f126
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/AnasOS/boot/grub/grub.cfg b/AnasOS/boot/grub/grub.cfg
@@ -1,3 +1,5 @@
+set timeout=5
+
 menuentry "AnasOS"{
     multiboot /boot/kernel
     boot

diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ test:
 	echo "No tests for now"
 
 kernel-rust:
-	@cd ./anasos-kernel && cargo +nightly build --release --target x86_64-unknown-none
+	@cd ./anasos-kernel && cargo build --release
 
 image:
 	@cp  ./anasos-kernel/target/x86_64-unknown-none/release/anasos-kernel AnasOS/boot/kernel

diff --git a/anasos-kernel/.cargo/config.toml b/anasos-kernel/.cargo/config.toml
@@ -2,7 +2,6 @@
 target = ["x86_64-unknown-none"]
 
 [target.x86_64-unknown-none]
-linker = "ld"
 rustflags = [
     "-C", "code-model=kernel",
     "-C", "relocation-model=static",

diff --git a/anasos-kernel/linker.ld b/anasos-kernel/linker.ld
@@ -1,9 +1,10 @@
-OUTPUT_FORMAT(elf32-i386)
+OUTPUT_FORMAT(binary)
 ENTRY(start)
 SECTIONS
 {
     . = 0x100000;
-    .text : {*(.text)}
-    .data : {*(.data)}
-    .bss  : {*(.bss)}
-}
+		.multiboot : { *(.multiboot) }
+    .text : 		 { *(.text) }
+    .data : 		 { *(.data) }
+    .bss  : 		 { *(.bss) }
+}
diff --git a/anasos-kernel/rust-toolchain b/anasos-kernel/rust-toolchain
@@ -0,0 +1 @@
+nightly