From: Pasukhin Dmitry <dpasukhi@opencascade.com>
Date: Sat, 19 Jul 2025 10:04:38 +0000 (+0100)
Subject: Configuration - Fix ARCH for older 32-bit macs (#626)
X-Git-Tag: V8_0_0_rc2~18
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=59738836c03d700540d00595da66a7b6f8beb4d1;p=occt.git

Configuration - Fix ARCH for older 32-bit macs (#626)

- Updates architecture detection conditions to include aarch64 and arm64 as 64-bit architectures
- Removes redundant ARCH="64" assignment for Darwin systems since it's already handled by the architecture check
- Fixes a syntax error in the existing aarch64 condition
---

diff --git a/adm/templates/env.install.sh.in b/adm/templates/env.install.sh.in
index 215ac4f219..467ca67209 100644
--- a/adm/templates/env.install.sh.in
+++ b/adm/templates/env.install.sh.in
@@ -34,7 +34,7 @@ shopt -u nocasematch
 
 # ----- Set path to 3rd party and OCCT libraries -----
 anArch=`uname -m`
-if [ "$anArch" != "x86_64" ] && [ "$anArch" != "ia64" ] && [ "$anArch" != "aarch64"]; then
+if [ "$anArch" != "x86_64" ] && [ "$anArch" != "ia64" ] && [ "$anArch" != "aarch64" ] && [ "$anArch" != "arm64" ]; then
   export ARCH="32";
 else
   export ARCH="64";
@@ -43,7 +43,6 @@ fi
 aSystem=`uname -s`
 if [ "$aSystem" == "Darwin" ]; then
   export WOKSTATION="mac";
-  export ARCH="64";
 else
   export WOKSTATION="lin";
 fi
diff --git a/adm/templates/env.sh b/adm/templates/env.sh
index 57a103eac0..dc2e811b2e 100644
--- a/adm/templates/env.sh
+++ b/adm/templates/env.sh
@@ -60,7 +60,7 @@ shopt -u nocasematch
 
 # ----- Setup Environment Variables -----
 anArch=`uname -m`
-if [ "$anArch" != "x86_64" ] && [ "$anArch" != "ia64" ]; then
+if [ "$anArch" != "x86_64" ] && [ "$anArch" != "ia64" ] && [ "$anArch" != "aarch64" ] && [ "$anArch" != "arm64" ]; then
   export ARCH="32";
 else
   export ARCH="64";
@@ -68,7 +68,6 @@ fi
 
 if [ "$aSystem" == "Darwin" ]; then
   export WOKSTATION="mac";
-  export ARCH="64";
 else
   export WOKSTATION="lin";
 fi