Merge "Update a few other places for target triple"
diff --git a/src/lib.rs b/src/lib.rs
index 3769e52..9e52567 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -326,7 +326,7 @@
fn get_target_triple(target_options: &TargetOptions) -> String {
let triple_cpu = get_triple_cpu(target_options);
- format!("{}-unknown-fuchsia", triple_cpu)
+ format!("{}-fuchsia", triple_cpu)
}
fn get_rustflags(
@@ -445,7 +445,7 @@
println!("options = {:?}", options);
}
- let target_triple_uc = format!("{}_unknown_fuchsia", triple_cpu).to_uppercase();
+ let target_triple_uc = format!("{}_fuchsia", triple_cpu).to_uppercase();
let fargo_command =
make_fargo_command(runner, &options, target_options, additional_target_args)?;
diff --git a/src/sdk.rs b/src/sdk.rs
index ec5a118..86d6361 100644
--- a/src/sdk.rs
+++ b/src/sdk.rs
@@ -3,6 +3,7 @@
// found in the LICENSE file.
use failure::Error;
+use get_target_triple;
use std::env;
use std::fs::File;
use std::io::Read;
@@ -118,7 +119,7 @@
pub fn cargo_out_dir(options: &TargetOptions) -> Result<PathBuf, Error> {
let fuchsia_dir = fuchsia_dir(options)?;
- let target_triple = format!("{}-unknown-fuchsia", options.target_cpu_linker);
+ let target_triple = get_target_triple(options);
Ok(fuchsia_dir
.join("garnet")
.join("target")
