From 92d7eaaf07f3b764a9c626c148a2a5652df590ad Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 17 Nov 2016 17:50:55 -0500
Subject: [PATCH] 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.
---
indra/newview/viewer_manifest.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 29751edfac2..1b6e8c97470 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1049,6 +1049,10 @@ def package_finish(self):
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()
--
GitLab