Introduce arm64 universal macOS library build support

.github/workflows/build.yaml

@@ -8,10 +8,10 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [windows-2022, macos-12, ubuntu-22.04]
+        os: [windows-2022, macos-15, ubuntu-22.04]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: secondlife/action-autobuild@v4
+      - uses: secondlife/action-autobuild@v5
   release:
     needs: build
     runs-on: [ubuntu-latest]

Makefile

@@ -59,7 +59,7 @@ ifneq ($(shell uname -p | grep -i powerpc),)
 nativeArch := ppc
 endif
 
-# arch: x86 (or i386), x64 (or x86_64), ppc, ppc64
+# arch: x86 (or i386), x64 (or x86_64), ppc, ppc64, arm64
 arch ?= i386
 
 # project: 'dom', 'domTest', or 'all'
@@ -103,7 +103,7 @@ $(error Invalid setting os=$(os))
 endif
 
 archs := $(sort $(subst i386,x86,$(arch)))
-ifneq ($(filter-out x86 ppc x86_64,$(archs)),)
+ifneq ($(filter-out x86 ppc x86_64 arm64,$(archs)),)
 $(error Invalid setting arch=$(arch))
 endif
 

build-cmd.sh

@@ -96,7 +96,7 @@ case "$AUTOBUILD_PLATFORM" in
                 then
                     "build/$versub/domTest.exe" -all
                 else
-                    # 64 bit exe ends up in different location to 32 bit hard coded 
+                    # 64 bit exe ends up in different location to 32 bit hard coded
                     # path to data directory - source code suggests it looks in a dir
                     # called domTestData first so we make one
                     mkdir -p "$projdir/x64/Release/domTestData"
@@ -111,7 +111,7 @@ case "$AUTOBUILD_PLATFORM" in
         libname="libcollada${collada_shortver}dom${dom_shortver}-s.lib"
         if [ "$AUTOBUILD_ADDRSIZE" = 32 ]
             then cp -a "build/$versub/$libname" "$stage"/lib/release/
-            else cp -a "$projdir/x64/Release/$libname" "$stage"/lib/release/ 
+            else cp -a "$projdir/x64/Release/$libname" "$stage"/lib/release/
         fi
     ;;
 
@@ -126,23 +126,21 @@ case "$AUTOBUILD_PLATFORM" in
         # repo                  root                run_tests               suffix
         export MACOSX_DEPLOYMENT_TARGET="$LL_BUILD_DARWIN_DEPLOY_TARGET"
 
-        opts="${TARGET_OPTS:--arch $AUTOBUILD_CONFIGURE_ARCH $LL_BUILD_RELEASE}"
+        opts="${TARGET_OPTS:--arch arm64 -arch x86_64 $LL_BUILD_RELEASE}"
 
         nproc=$(sysctl -n hw.physicalcpu)
 
         libdir="$top/stage"
         mkdir -p "$libdir"/lib/release
 
-        make clean arch="$AUTOBUILD_CONFIGURE_ARCH" # Hide 'arch' env var
-
         # Without the -Wno-etc flag, incredible spam is produced
         make \
             conf=release \
             -j$nproc \
             CFLAGS="$opts" \
             CXXFLAGS="$opts -Wno-unused-local-typedef" \
             LDFLAGS="-Wl,-headerpad_max_install_names" \
-            arch="$AUTOBUILD_CONFIGURE_ARCH" \
+            arch="x86_64 arm64" \
             printCommands=yes \
             printMessages=yes
 

make/common.mk

@@ -15,12 +15,14 @@ ifeq ($(conf),debug)
 ccFlags += -g -D_DEBUG
 debugSuffix := -d
 else
-ccFlags += -O2 -DNDEBUG
+ccFlags += -O3 -DNDEBUG
 debugSuffix :=
 endif
 
 ifeq ($(arch),x86_64)
 archsupport := -x64
+else ifeq ($(arch),arm64)
+archsupport := -a64
 else
 archsupport :=
 endif

make/rules.mk

@@ -41,7 +41,7 @@ ifneq ($(obj),)
 # any values we use in rule commands. This is the reason for all the target-specific variables.
 $(obj): cc := $(cc)
 $(obj): ccFlags := $(ccFlags)
-$(obj): ccFlagsNoArch := $(filter-out -arch ppc ppc64 i386 x86_64,$(ccFlags))
+$(obj): ccFlagsNoArch := $(filter-out -arch ppc ppc64 i386 x86_64 arm64,$(ccFlags))
 $(obj): includeOpts := $(includeOpts)
 
 # Call createObjRule with a source file path

make/rulesC.mk

@@ -52,7 +52,7 @@ ifneq ($(obj),)
 #$(obj): cc := $(cc)
 $(obj): cc := $(CC)
 $(obj): ccFlags := $(ccFlags)
-$(obj): ccFlagsNoArch := $(filter-out -arch ppc ppc64 i386 x86_64,$(ccFlags))
+$(obj): ccFlagsNoArch := $(filter-out -arch ppc ppc64 i386 x86_64 arm64,$(ccFlags))
 $(obj): includeOpts := $(includeOpts)
 
 # Call createObjRule with a source file path