summaryrefslogtreecommitdiff
path: root/build.sh
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2025-09-29 16:29:19 +0800
committerErik Kundiman <erik@megapahit.org>2025-10-01 16:56:56 +0800
commita954d290674db08ecaf3c1e6484a0cb6647b88b5 (patch)
tree3b672bac3e7d6807cd485ad5f041f69a5c729f46 /build.sh
parente6eaa7e29990431b5207dbb4f8ae5560cf884acb (diff)
parenta6d4c1d394eef2cea41f6c6bcd751fec746ec17d (diff)
Merge tag 'Second_Life_Release#a6d4c1d3-2025.07' into 2025.07
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/build.sh b/build.sh
index edd0c5a6d9..9958bfdf55 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()
@@ -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
@@ -412,7 +413,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"