Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
4311d5ea
Commit
4311d5ea
authored
13 years ago
by
David Parks
Browse files
Options
Downloads
Patches
Plain Diff
SH-1371 tcmalloc comes with the viewer now, don't look for it in /usr/lib
parent
5e4c0cd8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/newview/linux_tools/wrapper.sh
+17
-17
17 additions, 17 deletions
indra/newview/linux_tools/wrapper.sh
with
17 additions
and
17 deletions
indra/newview/linux_tools/wrapper.sh
+
17
−
17
View file @
4311d5ea
...
...
@@ -92,23 +92,23 @@ cd "${RUN_PATH}"
## subprocesses that care.
export
SAVED_LD_LIBRARY_PATH
=
"
${
LD_LIBRARY_PATH
}
"
if
[
-n
"
$LL_TCMALLOC
"
]
;
then
tcmalloc_libs
=
'/usr/lib/libtcmalloc.so.0 /usr/lib/libstacktrace.so.0 /lib/libpthread.so.0'
all
=
1
for
f
in
$tcmalloc_libs
;
do
if
[
!
-f
$f
]
;
then
all
=
0
fi
done
if
[
$all
!=
1
]
;
then
echo
'Cannot use tcmalloc libraries: components missing'
1>&2
else
export
LD_PRELOAD
=
$(
echo
$tcmalloc_libs
|
tr
' '
:
)
if
[
-z
"
$HEAPCHECK
"
-a
-z
"
$HEAPPROFILE
"
]
;
then
export
HEAPCHECK
=
${
HEAPCHECK
:-
normal
}
fi
fi
fi
#
if [ -n "$LL_TCMALLOC" ]; then
#
tcmalloc_libs='/usr/lib/libtcmalloc.so.0 /usr/lib/libstacktrace.so.0 /lib/libpthread.so.0'
#
all=1
#
for f in $tcmalloc_libs; do
#
if [ ! -f $f ]; then
#
all=0
#
fi
#
done
#
if [ $all != 1 ]; then
#
echo 'Cannot use tcmalloc libraries: components missing' 1>&2
#
else
#
export LD_PRELOAD=$(echo $tcmalloc_libs | tr ' ' :)
#
if [ -z "$HEAPCHECK" -a -z "$HEAPPROFILE" ]; then
#
export HEAPCHECK=${HEAPCHECK:-normal}
#
fi
#
fi
#
fi
export
SL_ENV
=
'LD_LIBRARY_PATH="`pwd`"/lib:"${LD_LIBRARY_PATH}"'
export
SL_CMD
=
'$LL_WRAPPER bin/do-not-directly-run-secondlife-bin'
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment