From 7e84d9125e471c7289b448d060cb0276be2d3824 Mon Sep 17 00:00:00 2001 From: Christian Goetze Date: Wed, 24 Jun 2009 15:13:53 +0000 Subject: Fix Mac Build --- indra/develop.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/develop.py') diff --git a/indra/develop.py b/indra/develop.py index f4143eb65c..7d0aec4a4a 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -444,8 +444,7 @@ class DarwinSetup(UnixSetup): targets = ' '.join(['-target ' + repr(t) for t in targets]) else: targets = '' - cmd = ('xcodebuild -parallelizeTargets ' - '-configuration %s %s %s' % + cmd = ('xcodebuild -configuration %s %s %s' % (self.build_type, ' '.join(opts), targets)) for d in self.build_dirs(): try: -- cgit v1.2.3 From ccba924dacfd8a3478dad8599f33786bf24fdc73 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Thu, 16 Jul 2009 11:20:16 -0700 Subject: 1st attempt at disabling ppc build on macs. --- indra/develop.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'indra/develop.py') diff --git a/indra/develop.py b/indra/develop.py index b40e81bb07..cee3329c60 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -414,11 +414,11 @@ class DarwinSetup(UnixSetup): 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 @@ class DarwinSetup(UnixSetup): 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 ' -- cgit v1.2.3