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

Use target parameter when invoking cargo build/rustc

Browse Source 
See phil-opp/blogOS#5.
This commit is contained in:
Philipp Oppermann
2015-10-24 16:36:12 +02:00
parent a57d769687
commit 76372f82f4
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
_posts/2015-09-02-setup-rust.md
View File

@@ -68,17 +68,23 @@ Let's break it down:
[unwinding]: https://doc.rust-lang.org/std/rt/unwind/ [unwinding]: https://doc.rust-lang.org/std/rt/unwind/
## Building Rust ## Building Rust
We can now build it using `cargo build`. It creates a static library at `target/debug/libblog_os.a`, which can be linked with our assembly kernel. To build and link the rust library on `make`, we extend our `Makefile`([full file][github makefile]): We can now build it using `cargo build`. To make sure, we are building it for the x86_64 architecture, we can pass an explicit target:
```bash
cargo build --target=x86_64-unknown-linux-gnu
```
It creates a static library at `target/x86_64-unknown-linux-gnu/debug/libblog_os.a`, which can be linked with our assembly kernel. To build and link the rust library on `make`, we extend our `Makefile`([full file][github makefile]):
```make ```make
# ... # ...
rust_os := target/debug/libblog_os.a target ?= $(arch)-unknown-linux-gnu
rust_os := target/$(target)/debug/libblog_os.a
# ... # ...
$(kernel): cargo $(rust_os) $(assembly_object_files) $(linker_script) $(kernel): cargo $(rust_os) $(assembly_object_files) $(linker_script)
@ld -n -T $(linker_script) -o $(kernel) $(assembly_object_files) $(rust_os) @ld -n -T $(linker_script) -o $(kernel) $(assembly_object_files) $(rust_os)
cargo: cargo:
@cargo build @cargo build --target $(target)
``` ```
We added a new `cargo` target that just executes `cargo build` and modified the `$(kernel)` target to link the created static lib . We added a new `cargo` target that just executes `cargo build` and modified the `$(kernel)` target to link the created static lib .
@@ -197,7 +203,7 @@ The easiest way of fixing this problem is to disable the landing pad creation si
```make ```make
cargo: cargo:
@cargo rustc -- -Z no-landing-pads @cargo rustc --target $(target) -- -Z no-landing-pads
``` ```
Now we fixed all linking issues. Now we fixed all linking issues.