diff options
| -rwxr-xr-x | acprep | 12 | ||||
| -rwxr-xr-x | tools/proof | 3 |
2 files changed, 10 insertions, 5 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) diff --git a/tools/proof b/tools/proof index c41745b6..5a329a50 100755 --- a/tools/proof +++ b/tools/proof @@ -14,7 +14,8 @@ fi rm -fr ~/Products/ledger* -time ./acprep -j16 --warn proof 2>&1 | tee ~/Desktop/proof.log +time ./acprep --universal -j16 --warn proof 2>&1 | \ + tee ~/Desktop/proof.log if egrep -q '(ERROR|CRITICAL)' ~/Desktop/proof.log; then if [[ "$1" = "--alert" ]]; then |