Merge pull request #150 from boozook/cargo/respect-sdk-path

Set sdk path to env if it was set as `--sdk` argument

cargo/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cargo-playdate"
-version = "0.3.5"
+version = "0.3.6"
 readme = "README.md"
 description = "Build tool for neat yellow console."
 keywords = ["playdate", "build", "cargo", "plugin", "cargo-subcommand"]

cargo/src/assets/plan.rs

@@ -38,13 +38,10 @@ impl<'a, 'cfg> LazyEnvBuilder<'a, 'cfg> {
 	pub fn get(&'a self) -> CargoResult<&'a Env> {
 		self.env.try_get_or_create(move || {
 			        let root = self.package.root().display().to_string();
-			        let mut vars = vec![
-			                            ("CARGO_PKG_NAME", self.package.name().to_string()),
-			                            ("CARGO_MANIFEST_DIR", root.to_string()),
+			        let vars = vec![
+			                        ("CARGO_PKG_NAME", self.package.name().to_string()),
+			                        ("CARGO_MANIFEST_DIR", root.to_string()),
 			];
-			        if let Some(path) = self.config.sdk_path.as_ref() {
-				        vars.push((SDK_ENV_VAR, path.display().to_string()));
-			        }
 
 			        let mut env = Env::from_iter(vars.into_iter()).map_err(|err| anyhow::anyhow!("{err}"))?;
 
@@ -55,6 +52,10 @@ impl<'a, 'cfg> LazyEnvBuilder<'a, 'cfg> {
 				        }
 			        }
 
+			        if let Some(path) = self.config.sdk_path.as_ref() {
+				        env.vars.insert(SDK_ENV_VAR.into(), path.display().to_string());
+			        }
+
 			        Ok::<_, anyhow::Error>(env)
 		        })
 	}

cargo/src/proc/utils.rs

@@ -4,6 +4,7 @@ use std::path::*;
 use std::env;
 use std::process::Command;
 
+use build::consts::SDK_ENV_VAR;
 use cargo::CargoResult;
 use cargo::Config as CargoConfig;
 
@@ -18,6 +19,10 @@ pub fn cargo_proxy_cmd(cfg: &Config, cmd: &Cmd) -> CargoResult<std::process::Com
 	proc.args(&cfg.args);
 	proc.args(&rustflags);
 
+	if let Some(path) = cfg.sdk_path.as_deref() {
+		proc.env(SDK_ENV_VAR, path);
+	}
+
 	Ok(proc)
 }