diff options
| author | John Wiegley <johnw@newartisans.com> | 2010-06-02 23:11:09 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2010-06-02 23:11:09 -0400 |
| commit | 626b6a17eb71d4f5308dbedaa53e890c74c1acd1 (patch) | |
| tree | b530c8cf1679a4b241c040df195e1b251dfa3062 /acprep | |
| parent | cda19829bd1100d6563b48ddb121f2afc1c55d95 (diff) | |
| parent | 6ceda8320fcd81376c3b8a8bc81e48b9e87f1926 (diff) | |
| download | fork-ledger-626b6a17eb71d4f5308dbedaa53e890c74c1acd1.tar.gz fork-ledger-626b6a17eb71d4f5308dbedaa53e890c74c1acd1.tar.bz2 fork-ledger-626b6a17eb71d4f5308dbedaa53e890c74c1acd1.zip | |
Merge branch 'next'
Diffstat (limited to 'acprep')
| -rwxr-xr-x | acprep | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -454,6 +454,9 @@ class PrepareBuild(CommandLineApp): op.add_option('', '--no-python', action='store_true', dest='no_python', default=False, help='Do not enable Python support by default') + op.add_option('', '--universal', action='store_true', + dest='universal', default=False, + help='Attempt to build universal binaries') op.add_option('', '--output', metavar='DIR', action="callback", callback=self.option_output, help='Build in the specified directory') @@ -1165,10 +1168,11 @@ class PrepareBuild(CommandLineApp): self.CXXFLAGS.append(i) self.CFLAGS.append(i) self.LDFLAGS.append(i) - for i in ['-arch', 'i386', '-arch', 'x86_64']: - self.CXXFLAGS.append(i) - self.CFLAGS.append(i) - self.LDFLAGS.append(i) + if self.options.universal: + for i in ['-arch', 'i386', '-arch', 'x86_64']: + self.CXXFLAGS.append(i) + self.CFLAGS.append(i) + self.LDFLAGS.append(i) else: for i in ['-O3', '-fomit-frame-pointer']: self.CXXFLAGS.append(i) |