diff options
| author | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-10-06 17:09:38 +0200 |
|---|---|---|
| committer | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-10-06 17:09:38 +0200 |
| commit | d18b636fb848f58eb103a01701b9a292344b8bd4 (patch) | |
| tree | 8f1361266952fc06c8f1056e150cad7c0542b0c9 | |
| parent | 9010dd5d3110fbd5f5de8fad7295111c8c412bf4 (diff) | |
| parent | e089937a0de6a82a6f39bb840c7dd99cfdde9869 (diff) | |
merged VWR-20893: "class Linux_x86_64Manifest" missing from viewer_manifest.py Breaking linux 64-bit build.
(transplanted https://bitbucket.org/Techwolf/viewer-development/changeset/111a293c0e1c to create an isolated daggy fix)
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/viewer_manifest.py | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index d58539dd71..cf1b977f08 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -652,6 +652,7 @@ Techwolf Lupindo SNOW-681 SNOW-690 VWR-12385 + VWR-20893 tenebrous pau VWR-247 Tharax Ferraris diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 949fa3cc1c..648366fa4c 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -956,6 +956,13 @@ class Linux_i686Manifest(LinuxManifest): self.path("libvivoxplatform.so") self.end_prefix("lib") +class Linux_x86_64Manifest(LinuxManifest): + def construct(self): + super(Linux_x86_64Manifest, self).construct() + + # support file for valgrind debug tool + self.path("secondlife-i686.supp") + ################################################################ if __name__ == "__main__": |