@@ -48,7 +48,7 @@ build_dir_Darwin()
4848
4949build_dir_Linux ()
5050{
51- echo build-linux-i686
51+ echo build-linux-x86_64
5252}
5353
5454build_dir_CYGWIN ()
@@ -156,6 +156,22 @@ pre_build()
156156 " -DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc." )
157157 fi
158158
159+ if [[ " $arch " == " Linux" ]]
160+ then
161+ # RELEASE_CRASH_REPORTING is tuned on unconditionaly, this is fine but not for Linux as of now (due to missing breakpad/crashpad support)
162+ RELEASE_CRASH_REPORTING=OFF
163+
164+ # Builds turn on HAVOK even when config is ReleaseOS.
165+ # This needs AUTOBUILD_GITHUB_TOKEN to be set in the environment. But this is not set for PRs apparently.
166+ # Still this seemlingy works on Windows and Mac, why not on the Linux runner? Mystery to be solved elsewhere.
167+
168+
169+ if [ " $variant " == " ReleaseOS" ]]
170+ then
171+ HAVOK=OFF
172+ fi
173+ fi
174+
159175 if [ " ${RELEASE_CRASH_REPORTING:- } " != " OFF" ]
160176 then
161177 case " $arch " in
@@ -200,14 +216,14 @@ package_llphysicsextensions_tpv()
200216 tpv_status=0
201217 # nat 2016-12-21: without HAVOK, can't build PhysicsExtensions_TPV.
202218 if [ " $variant " = " Release" -a " ${HAVOK:- } " != " OFF" ]
203- then
219+ then
204220 tpvconfig=" $build_dir /packages/llphysicsextensions/autobuild-tpv.xml"
205221 test -r " $tpvconfig " || fatal " No llphysicsextensions_tpv autobuild configuration found"
206222 # SL-19942: autobuild ignores -c switch if AUTOBUILD_CONFIGURATION set
207223 unset AUTOBUILD_CONFIGURATION
208224 " $autobuild " build --quiet --config-file " $( native_path " $tpvconfig " ) " -c Tpv \
209225 || fatal " failed to build llphysicsextensions_tpv"
210-
226+
211227 # capture the package file name for use in upload later...
212228 PKGTMP=` mktemp -t pgktpv.XXXXXX`
213229 cleanup=" $cleanup ; rm $PKGTMP * 2>/dev/null"
@@ -240,7 +256,7 @@ build()
240256 || fatal " failed building $variant "
241257 echo true > " $build_dir " /build_ok
242258 end_section " autobuild $variant "
243-
259+
244260 begin_section " extensions $variant "
245261 # Run build extensions
246262 if [ -d ${build_dir} /packages/build-extensions ]
@@ -313,7 +329,7 @@ begin_section "select viewer channel"
313329# Look for a branch-specific viewer_channel setting
314330# changeset_branch is set in the sling-buildscripts
315331viewer_build_branch=$( echo -n " ${changeset_branch:- $(repo_branch ${BUILDSCRIPTS_SRC:- $(pwd)} )} " | tr -Cs ' A-Za-z0-9_' ' _' | sed -E ' s/^_+//; s/_+$//' )
316- if [ -n " $viewer_build_branch " ]
332+ if [ -n " $viewer_build_branch " ]
317333then
318334 branch_viewer_channel_var=" ${viewer_build_branch} _viewer_channel"
319335 if [ -n " ${! branch_viewer_channel_var} " ]
435451 record_event " configure for $variant failed: build skipped"
436452 fi
437453
438- if ! $succeeded
454+ if ! $succeeded
439455 then
440456 record_event " remaining variants skipped due to $variant failure"
441457 break
500516 fi
501517 done
502518 end_section " Upload Debian Repository"
503-
519+
504520 else
505521 record_event " debian build not enabled"
506522 fi
0 commit comments