summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordzwdz2021-07-18 14:27:45 +0200
committerdzwdz2021-07-18 14:27:45 +0200
commitb38298319411965cbb7e9ed1312b24ba36cc7c44 (patch)
tree375c5a426d178b0c0f9190a44d0f7e9ee6216278
parented12953042ec38244f3ab93d67f4c2dea6f1fee3 (diff)
move the kernel linker script to src/kernel/
-rw-r--r--Makefile4
-rw-r--r--src/kernel/linker.ld (renamed from linker.ld)0
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index d40066f..5bb5dd4 100644
--- a/Makefile
+++ b/Makefile
@@ -22,9 +22,9 @@ out/fs/boot/init: src/test_module
@mkdir -p $(@D)
cp $< $@
-out/fs/boot/kernel.bin: $(call from_sources, src/kernel/)
+out/fs/boot/kernel.bin: src/kernel/linker.ld $(call from_sources, src/kernel/)
@mkdir -p $(@D)
- $(CC) $(LFLAGS) -T linker.ld $^ -o $@
+ $(CC) $(LFLAGS) -T $^ -o $@
grub-file --is-x86-multiboot $@
out/obj/%.s.o: src/%.s
diff --git a/linker.ld b/src/kernel/linker.ld
index 650ecd7..650ecd7 100644
--- a/linker.ld
+++ b/src/kernel/linker.ld