From 32db17a72809341c3589ab44e23280972e78f1fa Mon Sep 17 00:00:00 2001 From: Gemma Tipper Date: Tue, 29 Oct 2024 12:11:32 +0000 Subject: [PATCH] Change build script to correctly check target arch --- mirrord/cli/build.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mirrord/cli/build.rs b/mirrord/cli/build.rs index dfbaa241ff8..e4d6877f10a 100644 --- a/mirrord/cli/build.rs +++ b/mirrord/cli/build.rs @@ -10,8 +10,9 @@ fn main() { ); }; - #[cfg(all(target_os = "macos", target_arch = "aarch64"))] - if std::env::var("MIRRORD_LAYER_FILE_MACOS_ARM64").is_err() { + if std::env::var("MIRRORD_LAYER_FILE_MACOS_ARM64").is_err() + && std::env::var("CARGO_CFG_TARGET_ARCH").is_ok_and(|t| t.eq("aarch64")) + { println!("cargo::warning=No environment variable 'MIRRORD_LAYER_FILE_MACOS_ARM64' found - it should contain the path to the mirrord layer compiled for the `aarch64-apple-darwin` target"); exit(1); };