diff options
| author | Nat Linden <nat@lindenlab.com> | 2021-10-04 16:05:37 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-10-04 16:05:37 +0000 |
| commit | 05e01d58b684b81ca73ad3a68d882344cb93541e (patch) | |
| tree | 37dcf05a02ba41d8c5e58deb8c43034fea01ccf6 /build.sh | |
| parent | 68be3018ab1dcaf31e9a67cd0fc4d996b535d17f (diff) | |
| parent | db86ec9176dcbfabe5fddb3603da4132443f8b7f (diff) | |
Merged in SL-16040 (pull request #709), Nat's changes to allow autobuild with Tracy enabled on TeamCity.
SL-16040: TC viewer builds with Tracy enabled
Approved-by: Euclid Linden
Approved-by: Dave Parks
Diffstat (limited to 'build.sh')
| -rwxr-xr-x | build.sh | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -132,7 +132,11 @@ pre_build() fi set -x - "$autobuild" configure --quiet -c $variant -- \ + # honor autobuild_configure_parameters same as sling-buildscripts + eval_autobuild_configure_parameters=$(eval $(echo echo $autobuild_configure_parameters)) + + "$autobuild" configure --quiet -c $variant \ + ${eval_autobuild_configure_parameters:---} \ -DPACKAGE:BOOL=ON \ -DHAVOK:BOOL="$HAVOK" \ -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \ @@ -182,7 +186,11 @@ build() if $build_viewer then begin_section "autobuild $variant" - "$autobuild" build --no-configure -c $variant || fatal "failed building $variant" + # honor autobuild_build_parameters same as sling-buildscripts + eval_autobuild_build_parameters=$(eval $(echo echo $autobuild_build_parameters)) + "$autobuild" build --no-configure -c $variant \ + $eval_autobuild_build_parameters \ + || fatal "failed building $variant" echo true >"$build_dir"/build_ok end_section "autobuild $variant" |