commit 3c008be375d4d2e67b527ab700e80cc9f9e82f93
author Benjamin Brittain <bwb@google.com> Fri Jul 27 12:05:51 2018 -0700
committer Benjamin Brittain <bwb@google.com> Fri Jul 27 12:05:51 2018 -0700
tree 2bf6bd0925a909671d56f3bcdd4aa125eed54bda
parent 72d815a0bc302880e5e2cf23a7e788d665a4b841

[fargo][sysroot] Update triple and sysroot

Change-Id: I9e9b9209010489a3aad9c53516b124219ae301c0

src/lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index b254c29..3a08509 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -318,7 +318,7 @@
     target_options: &TargetOptions, sysroot_as_path: &PathBuf,
 ) -> Result<String, Error> {
     Ok(format!(
-        "-C link-arg=--target={}-unknown-fuchsia -C link-arg=--sysroot={} -Lnative={}",
+        "-C link-arg=--target={} -C link-arg=--sysroot={} -Lnative={}",
         get_target_triple(target_options),
         sysroot_as_path.to_str().unwrap(),
         shared_libraries_path(target_options)?.to_str().unwrap(),

src/sdk.rs

diff --git a/src/sdk.rs b/src/sdk.rs
index 0220801..ec5a118 100644
--- a/src/sdk.rs
+++ b/src/sdk.rs
@@ -134,6 +134,8 @@
     Ok(target_out_dir(&options)?
         .join("sdks")
         .join("zircon_sysroot")
+        .join("arch")
+        .join(options.target_cpu)
         .join("sysroot"))
 }