From e27ee760d67d755649fc08ab9f3008e4a7a199d7 Mon Sep 17 00:00:00 2001 From: Nathan Cannon Date: Wed, 8 Nov 2017 13:46:39 +0000 Subject: [PATCH] Moved linker options requiring files to pragmas in kernel,nim --- kernel/kernel.nim | 3 +++ nim.cfg | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/kernel.nim b/kernel/kernel.nim index 6e201b0..19d1f81 100644 --- a/kernel/kernel.nim +++ b/kernel/kernel.nim @@ -1,3 +1,6 @@ +{.link: "boot.o".} +{.passL: "-T kernel/arch/i386/linker.ld".} + import tty, gdt, irq, serial proc kernelMain() {.exportc: "kernel_main"}= diff --git a/nim.cfg b/nim.cfg index a075888..c138f9d 100644 --- a/nim.cfg +++ b/nim.cfg @@ -6,5 +6,5 @@ --cpu:i386 --os:standalone --passC:"-ffreestanding -nostdlib --target=i386-pc-none-elf -march=i386" ---passL:"-ffreestanding -target i386 -nostdlib -T ./kernel/arch/i386/linker.ld boot.o" +--passL:"-ffreestanding -target i386 -nostdlib" --out:"myos.bin"