From 65828f03de4c770c73f048b9842b7cfb5c8a9084 Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Thu, 18 Dec 2025 15:59:00 -0600
Subject: [PATCH] arm64 fixes

---
 src/scripts/docker_common.sh       | 1 +
 support/3rd_party/icu_configure.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/scripts/docker_common.sh b/src/scripts/docker_common.sh
index c1e0d9b..979380b 100755
--- a/src/scripts/docker_common.sh
+++ b/src/scripts/docker_common.sh
@@ -34,6 +34,7 @@ if [ "${PROJECT_BUILD_ARCH}" == "aarch64" ]; then
     -t ${DOCKER_TAG} . || exit 1
 else
   docker build ${APP_VERSION_BUILD_ARGS} \
+    --platform linux/amd64 \
     --build-arg C_STANDARD=${PROJECT_C_STANDARD} \
     --build-arg CXX_STANDARD=${PROJECT_CXX_STANDARD} \
     --build-arg NUM_JOBS=${NUM_JOBS} \
diff --git a/support/3rd_party/icu_configure.sh b/support/3rd_party/icu_configure.sh
index 0dcaa5f..b02196d 100755
--- a/support/3rd_party/icu_configure.sh
+++ b/support/3rd_party/icu_configure.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [ "$(uname -m)" == "arm64" ] &&
+if ([ "$(uname -m)" == "arm64" ] || [ "$(uname -m)" == "aarch64" ])  &&
   [ "${PROJECT_IS_ARM64}" == "0" ]; then
   HOST_CFG="--host=x86_64-apple-darwin"
   export CC="clang -arch x86_64"