Skip to content

Commit 7599c92

Browse files
committed
refactor(riscv-rt): use minilink in tests-build
1 parent 528517c commit 7599c92

File tree

2 files changed

+5
-18
lines changed

2 files changed

+5
-18
lines changed

tests-build/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ panic-halt = "1.0"
88
riscv = { path = "../riscv" }
99
riscv-rt = { path = "../riscv-rt" }
1010

11+
[build-dependencies]
12+
minilink = "0.2"
13+
1114
[features]
1215
pre-init = ["riscv-rt/pre-init"]
1316
single-hart = ["riscv-rt/single-hart"]

tests-build/build.rs

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,6 @@
11
use std::{env, fs::File, io::Write, path::PathBuf};
22

33
fn main() {
4-
// Put device.x somewhere the linker can find it
5-
let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
6-
File::create(out.join("device.x"))
7-
.unwrap()
8-
.write_all(include_bytes!("device.x"))
9-
.unwrap();
10-
println!("cargo:rustc-link-search={}", out.display());
11-
println!("cargo:rerun-if-changed=device.x");
12-
13-
// Put memory.x somewhere the linker can find it
14-
File::create(out.join("memory.x"))
15-
.unwrap()
16-
.write_all(include_bytes!("memory.x"))
17-
.unwrap();
18-
println!("cargo:rustc-link-search={}", out.display());
19-
println!("cargo:rerun-if-changed=memory.x");
20-
21-
println!("cargo:rerun-if-changed=build.rs");
4+
minilink::register_template("device.x", "device.x");
5+
minilink::register_template("memory.x", "memory.x");
226
}

0 commit comments

Comments
 (0)