diff --git a/Makefile b/Makefile index 6d4c9a8..3621f03 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,8 @@ arch ?= x86_64 kernel := build/kernel-$(arch).bin iso := build/os-$(arch).iso +target ?= $(arch)-blog_os +rust_os := target/$(target)/debug/libblog_os.a linker_script := src/arch/$(arch)/linker.ld grub_cfg := src/arch/$(arch)/grub.cfg @@ -8,7 +10,7 @@ assembly_source_files := $(wildcard src/arch/$(arch)/*.asm) assembly_object_files := $(patsubst src/arch/$(arch)/%.asm, \ build/arch/$(arch)/%.o, $(assembly_source_files)) -.PHONY: all clean run iso +.PHONY: all clean run iso kernel all: $(kernel) @@ -27,8 +29,12 @@ $(iso): $(kernel) $(grub_cfg) @grub-mkrescue -o $(iso) build/isofiles 2> /dev/null @rm -r build/isofiles -$(kernel): $(assembly_object_files) $(linker_script) - @ld -n -T $(linker_script) -o $(kernel) $(assembly_object_files) +$(kernel): kernel $(rust_os) $(assembly_object_files) $(linker_script) + @ld -n -T $(linker_script) -o $(kernel) \ + $(assembly_object_files) $(rust_os) + +kernel: + @xargo build --target $(target) # compile assembly files build/arch/$(arch)/%.o: src/arch/$(arch)/%.asm