From ccba924dacfd8a3478dad8599f33786bf24fdc73 Mon Sep 17 00:00:00 2001
From: brad kittenbrink <brad@lindenlab.com>
Date: Thu, 16 Jul 2009 11:20:16 -0700
Subject: [PATCH] 1st attempt at disabling ppc build on macs.
---
indra/develop.py | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/indra/develop.py b/indra/develop.py
index b40e81bb07c..cee3329c60e 100755
--- a/indra/develop.py
+++ b/indra/develop.py
@@ -414,11 +414,11 @@ def __init__(self):
def os(self):
return 'darwin'
- def arch(self):
- if self.unattended == 'ON':
- return 'universal'
- else:
- return UnixSetup.arch(self)
+ #def arch(self):
+ # if self.unattended == 'ON':
+ # return 'universal'
+ # else:
+ # return UnixSetup.arch(self)
def cmake_commandline(self, src_dir, build_dir, opts, simple):
args = dict(
@@ -433,7 +433,8 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple):
type=self.build_type.upper(),
)
if self.unattended == 'ON':
- args['universal'] = '-DCMAKE_OSX_ARCHITECTURES:STRING=\'i386;ppc\''
+ #args['universal'] = '-DCMAKE_OSX_ARCHITECTURES:STRING=\'i386;ppc\''
+ pass
#if simple:
# return 'cmake %(opts)s %(dir)r' % args
return ('cmake -G %(generator)r '
--
GitLab