Fix crates relying on rust_panic custom config.
This fixes `fargo check` for scoped_task
Change-Id: I8b0c74834694d47de2b9e6b74a6da706339095f5
Reviewed-on: https://fuchsia-review.googlesource.com/c/fargo/+/392219
Reviewed-by: Rob Tsuk <robtsuk@google.com>
diff --git a/src/lib.rs b/src/lib.rs
index 07de723..ea37c96 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -352,6 +352,10 @@
sysroot_lib.to_string(),
"-Cpanic=abort".to_string(),
"-Zpanic_abort_tests".to_string(),
+ // Add an extra config to let crates like scoped_task know we're compiling with
+ // panic=abort. This matches
+ // http://fuchsia.googlesource.com/fuchsia/+/08dce526941ac5be23cec1b50f841aad5ed37ea1/build/config/BUILD.gn#547
+ "--cfg=rust_panic=\"abort\"".to_string(),
"-Clink-arg=--pack-dyn-relocs=relr".to_string(),
"-Clink-arg=--threads".to_string(),
format!("-Clink-arg=-L{}", sysroot_lib),
@@ -637,8 +641,8 @@
writeln!(config, "[target.{}]", get_target_triple(target_options))?;
writeln!(
config,
- "rustflags = \"{}\"",
- get_rustflags(options, target_options, &sysroot_as_path)?
+ "rustflags = {}",
+ toml::ser::to_string(&get_rustflags(options, target_options, &sysroot_as_path)?)?
)?;
writeln!(
config,
