From 77d71dec863e28323bcafb1573cd1ecd54fe3049 Mon Sep 17 00:00:00 2001
From: Rye <rye@alchemyviewer.org>
Date: Thu, 28 Aug 2025 00:43:38 -0400
Subject: Fix up universal build

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index eb81ff319a..9118cb4346 100755
--- a/build.sh
+++ b/build.sh
@@ -40,7 +40,7 @@ retry_cmd()
 
 build_dir_Darwin()
 {
-  echo build-darwin-x86_64
+  echo build-darwin-universal
 }
 
 build_dir_Linux()
-- 
cgit v1.2.3


From 5ffcd3dc88892a651fe9a95974280efb85e18a8b Mon Sep 17 00:00:00 2001
From: Rye <rye@alchemyviewer.org>
Date: Thu, 28 Aug 2025 14:09:03 -0400
Subject: Fixes for GHA build

---
 build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 9118cb4346..36e332cf42 100755
--- a/build.sh
+++ b/build.sh
@@ -158,6 +158,7 @@ pre_build()
 
         if [[ "$arch" == "Darwin" ]]
         then
+            HAVOK=OFF
             SIGNING=("-DENABLE_SIGNING:BOOL=YES" \
                           "-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.")
         fi
@@ -387,7 +388,7 @@ do
       if `cat "$build_dir/build_ok"`
       then
           case "$variant" in
-            Release)
+            Release*)
               if [ -r "$build_dir/autobuild-package.xml" ]
               then
                   begin_section "Autobuild metadata"
-- 
cgit v1.2.3