From 50d0fd3fa2dd6d7be417b9b288a7399fe8c9f1fe Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Tue, 22 Sep 2020 10:45:33 -0400 Subject: [PATCH] Workaround iOS bugs in rustc --- src/cmd/mod.rs | 3 ++- src/prepare.rs | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/cmd/mod.rs b/src/cmd/mod.rs index d2af74e..b520e19 100644 --- a/src/cmd/mod.rs +++ b/src/cmd/mod.rs @@ -244,7 +244,8 @@ impl<'w, 'pl> Command<'w, 'pl> { sandbox, binary, args: Vec::new(), - env: Vec::new(), + // Workaround for https://github.com/rust-lang/rust/issues/76584 + env: vec![("SDKROOT".into(), "iPhoneOS.platform".into())], process_lines: None, cd: None, timeout, diff --git a/src/prepare.rs b/src/prepare.rs index de41a48..e65bc46 100644 --- a/src/prepare.rs +++ b/src/prepare.rs @@ -43,6 +43,7 @@ impl<'a> Prepare<'a> { self.tweak_toml()?; self.capture_lockfile(false)?; self.fetch_deps()?; + self.create_ios_sdkroot()?; Ok(()) } @@ -151,6 +152,10 @@ impl<'a> Prepare<'a> { } Ok(()) } + + fn create_ios_sdkroot(&mut self) -> Result<(), Error> { + Command::new(self.workspace, "mkdir").args(&["iPhoneOS.platform"]).run().map_err(Into::into) + } } struct TomlTweaker<'a> {