commit 42825d37bdadfaf149241c03f6525c14b9cb0491
author Dan Johnson <computerdruid@google.com> Sat Aug 08 01:54:06 2020 +0000
committer Dan Johnson <computerdruid@google.com> Sat Aug 08 01:54:06 2020 +0000
tree 3d1b33c7315a1d869e8fef2374ff8dc81462e148
parent 856cc3029136f8b7b0457e79add25d382485efc4

Adapt to new fdio location following http://fxrev.dev/399610

Change-Id: I43636cc14c4bef4e708211e00209e833d07fc93c
Reviewed-on: https://fuchsia-review.googlesource.com/c/fargo/+/414620
Reviewed-by: Rob Tsuk <robtsuk@google.com>

src/package.rs

diff --git a/src/package.rs b/src/package.rs
index 1d099dc..eecc2ac 100644
--- a/src/package.rs
+++ b/src/package.rs
@@ -128,11 +128,7 @@
         zircon_build.to_string_lossy(),
         target_options.config.fuchsia_arch
     );
-    let fdio_path = format!(
-        "{}/user-{}-clang.shlib/obj/system/ulib/fdio/libfdio.so",
-        zircon_build.to_string_lossy(),
-        target_options.config.fuchsia_arch
-    );
+    let fdio_path = format!("{}/libfdio.so", shared_lib_str);
     let libsyslog_path = format!("{}/libsyslog.so", shared_lib_str);
     let libtraceengine_path = format!("{}/libtrace-engine.so", shared_lib_str);
     let libasync_path = format!("{}/libasync-default.so", shared_lib_str);