Skip to content

Commit 0c5cd6e

Browse files
committed
rustsbi-qemu: include linker in build script as argument
...so that we don't need to copy and paster linker script files into target build folder Signed-off-by: luojia65 <me@luojia.cc>
1 parent 42cb930 commit 0c5cd6e

File tree

2 files changed

+3
-23
lines changed

2 files changed

+3
-23
lines changed

rustsbi-qemu/.cargo/config.toml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,2 @@
1-
[target.riscv64imac-unknown-none-elf]
2-
rustflags = [
3-
"-C", "link-arg=-Tlinker64.ld",
4-
]
5-
6-
[target.riscv32imac-unknown-none-elf]
7-
rustflags = [
8-
"-C", "link-arg=-Tlinker32.ld",
9-
]
1+
[build]
2+
target = "riscv64imac-unknown-none-elf"

rustsbi-qemu/build.rs

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,4 @@
1-
use std::env;
2-
use std::fs;
3-
use std::io::Write;
4-
use std::path::PathBuf;
5-
61
fn main() {
72
println!("cargo:rerun-if-changed=build.rs");
8-
println!("cargo:rerun-if-changed=src/linker64.ld");
9-
10-
let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
11-
12-
fs::File::create(out_dir.join("linker64.ld"))
13-
.unwrap()
14-
.write_all(include_bytes!("src/linker64.ld"))
15-
.unwrap();
16-
println!("cargo:rustc-link-search={}", out_dir.display());
3+
println!("cargo:rustc-link-arg=-Trustsbi-qemu/src/linker64.ld");
174
}

0 commit comments

Comments
 (0)