summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-11-17 17:50:55 -0500
committerNat Goodspeed <nat@lindenlab.com>2016-11-17 17:50:55 -0500
commit92d7eaaf07f3b764a9c626c148a2a5652df590ad (patch)
treef4ebf4541054b42ced17978b99cb77458c37163e /indra/newview/viewer_manifest.py
parent73a7b14013059eee3b010ae271515d7492654f9b (diff)
DRTVWR-418: Provide Darwin_i686_Manifest alias to Darwin_i386_Manifest.
It's never been clear to me why Macs tend to refer to 32-bit Intel processors as i386 when other platforms tend to refer to them as i686. New CMake logic to derive ARCH from ADDRESS_SIZE produces i686. Give viewer_manifest.py a Darwin_i686_Manifest class alias so it continues to work when arch is passed as i686 as well as i386.
Diffstat (limited to 'indra/newview/viewer_manifest.py')
-rwxr-xr-xindra/newview/viewer_manifest.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 29751edfac..1b6e8c9747 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1049,6 +1049,10 @@ class Darwin_i386_Manifest(ViewerManifest):
self.package_file = finalname
self.remove(sparsename)
+class Darwin_i686_Manifest(Darwin_i386_Manifest):
+ """alias in case arch is passed as i686 instead of i386"""
+ pass
+
class LinuxManifest(ViewerManifest):
def construct(self):
super(LinuxManifest, self).construct()