Automated merge with head of lindenlab/viewer64

1 files changed, 8 insertions, 5 deletions

diff --git a/build.sh b/build.sh
index 531be4f81d..9ca130b5d5 100755
--- a/build.sh
+++ b/build.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # This is the custom build script for the viewer
 #
@@ -96,13 +96,15 @@ pre_build()
     && template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$master_message_template_checkout/message_template.msg"
 
     # 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.
+    RELEASE_CRASH_REPORTING=ON
+    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
 
     "$autobuild" configure --quiet -c $variant -- \
@@ -114,6 +116,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"