michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 14:27:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5 from phil-opp/rust-target

Browse Source 
Specify rust target
This commit is contained in:
Philipp Oppermann
2015-10-24 16:25:50 +02:00
parent 95028c0f5d 3d94304bbb
commit 9cd9ec25db
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -13,10 +13,11 @@
# limitations under the License. # limitations under the License.
arch ?= x86_64 arch ?= x86_64
target ?= $(arch)-unknown-linux-gnu
kernel := build/kernel-$(arch).bin kernel := build/kernel-$(arch).bin
iso := build/os-$(arch).iso iso := build/os-$(arch).iso
rust_os := target/debug/libblog_os.a rust_os := target/$(target)/debug/libblog_os.a
linker_script := src/arch/$(arch)/linker.ld linker_script := src/arch/$(arch)/linker.ld
grub_cfg := src/arch/$(arch)/grub.cfg grub_cfg := src/arch/$(arch)/grub.cfg
assembly_source_files := $(wildcard src/arch/$(arch)/*.asm) assembly_source_files := $(wildcard src/arch/$(arch)/*.asm)
@@ -47,7 +48,7 @@ $(kernel): cargo $(rust_os) $(assembly_object_files) $(linker_script)
@ld -n --gc-sections -T $(linker_script) -o $(kernel) $(assembly_object_files) $(rust_os) @ld -n --gc-sections -T $(linker_script) -o $(kernel) $(assembly_object_files) $(rust_os)
cargo: cargo:
@cargo rustc -- -Z no-landing-pads @cargo rustc --target $(target) -- -Z no-landing-pads
# compile assembly files # compile assembly files
build/arch/$(arch)/%.o: src/arch/$(arch)/%.asm build/arch/$(arch)/%.o: src/arch/$(arch)/%.asm