Mercurial > hg-stable
comparison setup.py @ 14324:d3a49a52f117
Hardcoding ARCHFLAGS breaks the build against fink's python
Fink's python is either i386 or amd64, but not universal. Setting ARCHFLAGS to the
empty string produces a successful build against both OS X python and fink python.
The modules will no longer be universal -- if that is an issue, we can change the
test to extract ARCHFLAGS from distutils.sysconfig and remove ppc if necessary.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Sat, 14 May 2011 22:07:58 -0700 |
parents | bb7e3b3e6e11 |
children | 3818c67a501e |
comparison
equal
deleted
inserted
replaced
14323:a79fea6b3e77 | 14324:d3a49a52f117 |
---|---|
384 # distutils.sysconfig | 384 # distutils.sysconfig |
385 version = runcmd(['/usr/bin/xcodebuild', '-version'], {})[0].splitlines()[0] | 385 version = runcmd(['/usr/bin/xcodebuild', '-version'], {})[0].splitlines()[0] |
386 # Also parse only first digit, because 3.2.1 can't be parsed nicely | 386 # Also parse only first digit, because 3.2.1 can't be parsed nicely |
387 if (version.startswith('Xcode') and | 387 if (version.startswith('Xcode') and |
388 StrictVersion(version.split()[1]) >= StrictVersion('4.0')): | 388 StrictVersion(version.split()[1]) >= StrictVersion('4.0')): |
389 os.environ['ARCHFLAGS'] = '-arch i386 -arch x86_64' | 389 os.environ['ARCHFLAGS'] = '' |
390 | 390 |
391 setup(name='mercurial', | 391 setup(name='mercurial', |
392 version=setupversion, | 392 version=setupversion, |
393 author='Matt Mackall', | 393 author='Matt Mackall', |
394 author_email='mpm@selenic.com', | 394 author_email='mpm@selenic.com', |