commit b3f7b1d9890e2ebc471d485689990940857098ac
author Rob Tsuk <robtsuk@google.com> Wed Jul 10 10:04:10 2019 -0700
committer Rob Tsuk <robtsuk@google.com> Wed Jul 10 10:04:10 2019 -0700
tree f7ec972900db608257246a40833f6527a04fc97b
parent 0df3cc82dea22c3acc8814752fe618dfd8382255

Update lib location for clang change

Change-Id: I75113bfeec02c15e6baf58a09956ed28f22311f4

src/lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 6c38440..5e0744f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -398,9 +398,9 @@
     sysroot_as_path: &PathBuf,
 ) -> Result<String, Error> {
     let target_triple = get_target_triple(target_options);
-    let zircon_build_dir = zircon_build_path(&target_options.config)?;
     let sysroot_lib_pathbuf = sysroot_as_path.join("lib");
     let sysroot_lib = sysroot_lib_pathbuf.to_string_lossy();
+    let shared_lib_path = shared_libraries_path(target_options)?;
     let clang_resource_lib = clang_resource_dir(&target_triple)?.join(&target_triple).join("lib");
 
     let mut rust_flags = vec![
@@ -409,16 +409,8 @@
         "-Clink-arg=--pack-dyn-relocs=relr".to_string(),
         "-Clink-arg=--threads".to_string(),
         format!("-Clink-arg=-L{}", sysroot_lib),
-        format!(
-            "-Clink-arg=-L{}/user-{}-gcc.shlib/obj/system/ulib/fdio",
-            zircon_build_dir.to_string_lossy(),
-            target_options.config.fuchsia_arch
-        ),
-        format!(
-            "-Clink-arg=-L{}/user-{}-gcc.shlib/obj/system/ulib/syslog",
-            zircon_build_dir.to_string_lossy(),
-            target_options.config.fuchsia_arch
-        ),
+        format!("-Clink-arg=-L{}/gen/zircon/public/lib/fdio", shared_lib_path.to_string_lossy(),),
+        format!("-Clink-arg=-L{}/gen/zircon/public/lib/syslog", shared_lib_path.to_string_lossy(),),
         format!("-Clink-arg=-L{}", clang_resource_lib.to_string_lossy()),
         format!("-Clink-arg=--sysroot={}", sysroot_as_path.to_string_lossy()),
         format!("-Lnative={}", shared_libraries_path(target_options)?.to_string_lossy()),

src/package.rs

diff --git a/src/package.rs b/src/package.rs
index 5322345..0f13db6 100644
--- a/src/package.rs
+++ b/src/package.rs
@@ -84,17 +84,17 @@
     let mut manifest = File::create(&target)?;
     let zircon_build = zircon_build_path(&target_options.config)?;
     let libc_path = format!(
-        "{}/user-{}-gcc.shlib/obj/system/ulib/c/libc.so",
+        "{}/user-{}-clang.shlib/obj/system/ulib/c/libc.so",
         zircon_build.to_string_lossy(),
         target_options.config.fuchsia_arch
     );
     let fdio_path = format!(
-        "{}/user-{}-gcc.shlib/obj/system/ulib/fdio/libfdio.so",
+        "{}/user-{}-clang.shlib/obj/system/ulib/fdio/libfdio.so",
         zircon_build.to_string_lossy(),
         target_options.config.fuchsia_arch
     );
     let libsyslog_path = format!(
-        "{}/user-{}-gcc.shlib/obj/system/ulib/syslog/libsyslog.so",
+        "{}/user-{}-clang.shlib/obj/system/ulib/syslog/libsyslog.so",
         zircon_build.to_string_lossy(),
         target_options.config.fuchsia_arch
     );