Use just RUSTC instead of a target trip env variable
It appears that cargo only supports the simple RUSTC env
variable.
Also pass -v to cargo when it is passed to fargo.
Change-Id: Id752d9057677c68fdd960c63e510940874d0ebd9
diff --git a/src/lib.rs b/src/lib.rs
index e2c4952..0eaa163 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -356,6 +356,7 @@
if options.verbose {
runner_args.push("-v");
+ target_args.push("-v");
}
if let Some(device_name) = target_options.device_name {
@@ -391,13 +392,11 @@
let runner_env_name = format!("CARGO_TARGET_{}_RUNNER", target_triple_uc);
let rustflags_env_name = format!("CARGO_TARGET_{}_RUSTFLAGS", target_triple_uc);
let linker_env_name = format!("CARGO_TARGET_{}_LINKER", target_triple_uc);
- let rustc_env_name = format!("CARGO_TARGET_{}_RUSTC", target_triple_uc);
if options.verbose {
println!("runner_env_name: {:?}", runner_env_name);
println!("rustflags_env_name: {:?}", rustflags_env_name);
println!("linker_env_name: {:?}", linker_env_name);
- println!("rustc_env_name: {:?}", rustc_env_name);
println!("rustc_path: {:?}", rustc_path(target_options)?.to_str().unwrap());
println!("cargo_path: {:?}", cargo_path(target_options)?.to_str().unwrap());
}
@@ -417,7 +416,7 @@
clang_linker_path(target_options)?.to_str().unwrap(),
)
.env(
- rustc_env_name,
+ "RUSTC",
rustc_path(target_options)?.to_str().unwrap(),
)
.env(
