Merge #473

473: Replace rustflags with build.rs extra-link-args. r=Dirbaio a=Dirbaio

Rustflags apply to ALL the crates in the graph, while we only need
them for the toplevel crate which is the only one getting linked.

Rustflags are not equal for all crates, this caused cargo to re-build the
same dependency crate multiple times uselessly. After this change, deps
are reused more, making builds faster.

Note that this only applies when sharing the target/ dir for multiple crates
in the repo which is not the default.

Co-authored-by: Dario Nieuwenhuis <[email protected]>

2 files changed, 4 insertions, 12 deletions

diff --git a/examples/stm32f7/.cargo/config.toml b/examples/stm32f7/.cargo/config.toml
index 632e81541..f490ed8e4 100644
--- a/examples/stm32f7/.cargo/config.toml
+++ b/examples/stm32f7/.cargo/config.toml
@@ -2,17 +2,5 @@
 # replace STM32F429ZITx with your chip as listed in `probe-run --list-chips`
 runner = "probe-run --chip STM32F767ZITx"
 
-rustflags = [
-  # LLD (shipped with the Rust toolchain) is used as the default linker
-  "-C", "link-arg=--nmagic",
-  "-C", "link-arg=-Tlink.x",
-  "-C", "link-arg=-Tdefmt.x",
-
-  # Code-size optimizations.
-  "-Z", "trap-unreachable=no",
-  "-C", "inline-threshold=5",
-  "-C", "no-vectorize-loops",
-]
-
 [build]
 target = "thumbv7em-none-eabihf"
diff --git a/examples/stm32f7/build.rs b/examples/stm32f7/build.rs
index b81f6b6e1..b72dd55ec 100644
--- a/examples/stm32f7/build.rs
+++ b/examples/stm32f7/build.rs
@@ -35,5 +35,9 @@ fn main() -> Result<(), Error> {
     // Tell Cargo where to find the file.
     println!("cargo:rustc-link-search={}", out_dir.display());
 
+    println!("cargo:rustc-link-arg-bins=--nmagic");
+    println!("cargo:rustc-link-arg-bins=-Tlink.x");
+    println!("cargo:rustc-link-arg-bins=-Tdefmt.x");
+
     Ok(())
 }