commit db45b8618130173d9fe12749a3420fcc157c63b7
author Rob Tsuk <robtsuk@google.com> Tue May 12 18:48:29 2020 +0000
committer Rob Tsuk <robtsuk@google.com> Tue May 12 18:48:29 2020 +0000
tree 6f288bbe22cef4da5d346bc38be5db0bac10d8d8
parent 8f26d20b4228ae13e9b7663eb784d7877cc4fb7e

Updates to match build

Pass panic=abort and adjust to a new location for libsyslog.so.

Change-Id: I8617fdc9d0c17b0066cdd7ffd1e4f410f620a49d
Reviewed-on: https://fuchsia-review.googlesource.com/c/fargo/+/389273
Reviewed-by: Dan Johnson <computerdruid@google.com>

src/lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 619ebd5..9a12181 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -350,6 +350,7 @@
     let mut rust_flags = vec![
         "-L".to_string(),
         sysroot_lib.to_string(),
+        "-Cpanic=abort".to_string(),
         "-Clink-arg=--pack-dyn-relocs=relr".to_string(),
         "-Clink-arg=--threads".to_string(),
         format!("-Clink-arg=-L{}", sysroot_lib),

src/package.rs

diff --git a/src/package.rs b/src/package.rs
index 48b7bef..63233b8 100644
--- a/src/package.rs
+++ b/src/package.rs
@@ -121,6 +121,7 @@
     let triple = get_triple_cpu(target_options);
     let mut manifest = File::create(&target)?;
     let zircon_build = zircon_build_path(&target_options.config)?;
+    let shared_lib_path = shared_libraries_path(target_options)?;
     let libc_path = format!(
         "{}/user-{}-clang.shlib/obj/system/ulib/c/libc.so",
         zircon_build.to_string_lossy(),
@@ -132,9 +133,8 @@
         target_options.config.fuchsia_arch
     );
     let libsyslog_path = format!(
-        "{}/user-{}-clang.shlib/obj/system/ulib/syslog/libsyslog.so",
-        zircon_build.to_string_lossy(),
-        target_options.config.fuchsia_arch
+        "{}/libsyslog.so",
+        shared_lib_path.to_string_lossy(),
     );
     let libtraceengine_path = format!(
         "{}/user-{}-clang.shlib/obj/system/ulib/trace-engine/libtrace-engine.so",
@@ -162,7 +162,6 @@
         triple,
     );
 
-    let shared_lib_path = shared_libraries_path(target_options)?;
     let additional_libs: Vec<String> = run_cargo_options
         .fargo_manifest
         .additional_shared_libraries