Merge pull request #67 from kaspar030/insert-after

use "INSERT AFTER" in embedded-test.x

Author: t-moe

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Ensure `embedded-test.x` is only augmenting the linker scripts
 - Make `std` enable `serde-json-core`'s `heapless` feature
 
 ## [0.6.2]

embedded-test.x

@@ -14,3 +14,9 @@ SECTIONS
     KEEP(*(.embedded_test.*));
   }
 }
+
+# Without this `INSERT ...`, including this linker script using `-T...` will
+# replace the default linker script if this is the first linker script
+# included.
+# See https://github.com/probe-rs/embedded-test/pull/67 for more information.
+INSERT AFTER .comment;

examples/std/build.rs

@@ -2,7 +2,7 @@ use std::env;
 
 fn main() {
     // add linker script for embedded-test!!
-    println!("cargo::rustc-link-arg-tests=../../embedded-test.x");
+    println!("cargo::rustc-link-arg-tests=-Tembedded-test.x");
 
     // Check if the `defmt` feature is enabled, and if so link its linker script
     if env::var("CARGO_FEATURE_DEFMT").is_ok() {