diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-27 11:04:13 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-27 11:04:13 -0500 |
| commit | 15ec54b1daef88881b0dc9acb0e14290be8e9e5d (patch) | |
| tree | f9396e31625c753d6a2aad68d37d2000e32e86bd /indra | |
| parent | 16b6595fa75047c6c53ee11a6c3004e99ae0937d (diff) | |
Fix for linux build failure when tcmalloc disabled
Diffstat (limited to 'indra')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/viewer_manifest.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 0931c4ec9b..43abae63f1 100644..100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1057,9 +1057,15 @@ class Linux_i686Manifest(LinuxManifest): self.path("libopenal.so", "libopenal.so.1") self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname self.path("libfontconfig.so.1.4.4") - self.path("libtcmalloc.so", "libtcmalloc.so") #formerly called google perf tools - self.path("libtcmalloc.so.0", "libtcmalloc.so.0") #formerly called google perf tools - self.path("libtcmalloc.so.0.1.0", "libtcmalloc.so.0.1.0") #formerly called google perf tools + try: + self.path("libtcmalloc.so", "libtcmalloc.so") #formerly called google perf tools + self.path("libtcmalloc.so.0", "libtcmalloc.so.0") #formerly called google perf tools + self.path("libtcmalloc.so.0.1.0", "libtcmalloc.so.0.1.0") #formerly called google perf tools + pass + except: + print "tcmalloc files not found, skipping" + pass + try: self.path("libfmod-3.75.so") pass |