From 69a7a27e6f7ecc7336c83cf9da271d41ac34c8ec Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Wed, 26 Oct 2022 14:37:14 +0200 Subject: [PATCH 1/4] WIP Switch to my fork of `robust-predicates` --- Cargo.lock | 6 +----- Cargo.toml | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 90a9219fd8..15c7a5e495 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2768,11 +2768,7 @@ checksum = "e5864e7ef1a6b7bcf1d6ca3f655e65e724ed3b52546a0d0a663c991522f552ea" [[package]] name = "robust-predicates" version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddcbdd0b6bbb300dabed5c0faacb570e0dbafe71338d34a7caff70a5e98fed47" -dependencies = [ - "cc", -] +source = "git+https://github.com/hannobraun/robust-predicates.git#99bcbb24886eda34f5a4f794cccb5f236c8bbbc7" [[package]] name = "rustc-demangle" diff --git a/Cargo.toml b/Cargo.toml index 871799229b..dd5a92dc53 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -94,3 +94,7 @@ path = "crates/fj-viewer" [workspace.dependencies.fj-window] version = "0.21.0" path = "crates/fj-window" + + +[patch.crates-io.robust-predicates] +git = "https://github.com/hannobraun/robust-predicates.git" From 6a6f1fdcd03cea372d151455deb62e88a3e4db93 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Wed, 26 Oct 2022 13:27:48 +0200 Subject: [PATCH 2/4] Specify targets in separate list --- tools/cross-compiler/src/main.rs | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/tools/cross-compiler/src/main.rs b/tools/cross-compiler/src/main.rs index 1f1dffebb4..f03d9e7906 100644 --- a/tools/cross-compiler/src/main.rs +++ b/tools/cross-compiler/src/main.rs @@ -10,6 +10,7 @@ use std::process::Command; use anyhow::anyhow; fn main() -> anyhow::Result<()> { + let targets = ["wasm32-unknown-unknown"]; let crates = [ "fj", "fj-export", @@ -21,20 +22,22 @@ fn main() -> anyhow::Result<()> { "fj-viewer", ]; - for crate_ in crates { - let mut command = Command::new("cargo"); - command - .arg("build") - .arg("--all-features") - .args(["--target", "wasm32-unknown-unknown"]) - .args(["-p", crate_]) - .env("RUSTFLAGS", "-D warnings"); + for target in targets { + for crate_ in crates { + let mut command = Command::new("cargo"); + command + .arg("build") + .arg("--all-features") + .args(["--target", target]) + .args(["-p", crate_]) + .env("RUSTFLAGS", "-D warnings"); - println!("Running {command:?}"); - let status = command.status()?; + println!("Running {command:?}"); + let status = command.status()?; - if !status.success() { - return Err(anyhow!("Cargo exited with error code: {status}")); + if !status.success() { + return Err(anyhow!("Cargo exited with error code: {status}")); + } } } From 3cb6c00b47f4543ca97a0cd369f75e9da03a00d2 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Wed, 26 Oct 2022 14:31:18 +0200 Subject: [PATCH 3/4] Add Android target to toolchain --- rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 49b8a01970..5990eaa09a 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] channel = "1.64.0" components = ["rustfmt", "clippy"] -targets = ["wasm32-unknown-unknown"] +targets = ["aarch64-linux-android", "wasm32-unknown-unknown"] From a914a579a9df301464dcf5908b4643a66cfea1d3 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Wed, 26 Oct 2022 14:31:33 +0200 Subject: [PATCH 4/4] Cross-compile to Android target --- tools/cross-compiler/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cross-compiler/src/main.rs b/tools/cross-compiler/src/main.rs index f03d9e7906..d22b3370ea 100644 --- a/tools/cross-compiler/src/main.rs +++ b/tools/cross-compiler/src/main.rs @@ -10,7 +10,7 @@ use std::process::Command; use anyhow::anyhow; fn main() -> anyhow::Result<()> { - let targets = ["wasm32-unknown-unknown"]; + let targets = ["aarch64-linux-android", "wasm32-unknown-unknown"]; let crates = [ "fj", "fj-export",