diff options
| -rw-r--r-- | autobuild.xml | 8 | ||||
| -rwxr-xr-x | build.sh | 8 | ||||
| -rw-r--r-- | indra/llappearance/llavatarappearance.cpp | 1 |
3 files changed, 9 insertions, 8 deletions
diff --git a/autobuild.xml b/autobuild.xml index 2bf12fcba0..e0e43bbb46 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3392,8 +3392,6 @@ <string>Release</string> <string>-project</string> <string>SecondLife.xcodeproj</string> - <string>-DENABLE_SIGNING:BOOL=YES</string> - <string>-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.</string> </array> </map> <key>configure</key> @@ -3419,10 +3417,8 @@ <string>xcodebuild</string> <key>options</key> <array> - <string>-configuration Release</string> - <string>-project SecondLife.xcodeproj</string> - <string>-DENABLE_SIGNING:BOOL=YES</string> - <string>-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.</string> + <string>-configuration</string><string>Release</string> + <string>-project</string><string>SecondLife.xcodeproj</string> </array> </map> <key>configure</key> @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # This is the custom build script for the viewer # @@ -98,9 +98,14 @@ pre_build() # nat 2016-12-20: disable HAVOK on Mac until we get a 64-bit Mac build. # nat 2016-12-21: disable generate_breakpad_symbols.py on Mac until we # figure out why it's breaking. + SIGNING=() if [ "$arch" == "Darwin" ] then HAVOK=OFF RELEASE_CRASH_REPORTING=OFF + if [ "$variant" == "Release" ] + then SIGNING=("-DENABLE_SIGNING:BOOL=YES" \ + "-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.") + fi else HAVOK=ON RELEASE_CRASH_REPORTING=ON fi @@ -114,6 +119,7 @@ pre_build() -DGRID:STRING="\"$viewer_grid\"" \ -DLL_TESTS:BOOL="$run_tests" \ -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url \ + "${SIGNING[@]}" \ || fatal "$variant configuration failed" end_section "Configure $variant" diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp index 2f0b583ed2..ab6d77dd9b 100644 --- a/indra/llappearance/llavatarappearance.cpp +++ b/indra/llappearance/llavatarappearance.cpp @@ -2126,4 +2126,3 @@ LLAvatarAppearance::LLMaskedMorph::LLMaskedMorph(LLVisualParam *morph_target, BO } } - |