diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2018-06-12 10:12:50 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2018-06-12 10:12:50 -0400 |
commit | c32ede22bba6753554ea2ca39942027ad601e950 (patch) | |
tree | 783fad5e2fdb9737652b791ec4b97ed1eeec35ca /build.sh | |
parent | 043a38bf0f9463439ad610e729ab5f54c2c736d0 (diff) | |
parent | 176b8861742e3f80eddbf4d15b9cb21390b21088 (diff) |
DRTVWR-447: merge Oz's recent changes
Diffstat (limited to 'build.sh')
-rwxr-xr-x | build.sh | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -120,12 +120,10 @@ pre_build() "$autobuild" configure --quiet -c $variant -- \ -DPACKAGE:BOOL=ON \ - -DUNATTENDED:BOOL=ON \ -DHAVOK:BOOL="$HAVOK" \ -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \ -DVIEWER_CHANNEL:STRING="${viewer_channel}" \ -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" @@ -205,6 +203,8 @@ then exit 1 fi +shopt -s nullglob # if nothing matches a glob, expand to nothing + initialize_build # provided by master buildscripts build.sh begin_section "autobuild initialize" |