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 215ac4f2190b92525b57059a5c4f4c6b352d7959..467ca67209526b65c0fd572d1521ac3ca79b0d7f 100644 (file)
--- 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 57a103eac01adf75879d4e59fef0cbc7100887ac..dc2e811b2e35d9c8e46c728625d076505a4ccb96 100644 (file)
--- 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