summaryrefslogtreecommitdiff
path: root/acprep
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2012-07-30 23:22:42 -0500
committerJohn Wiegley <johnw@newartisans.com>2012-07-30 23:24:04 -0500
commit14ab4f7775fe203e6e5cd2b9cb4d364c465c4e4e (patch)
tree50c8ebbffd4682e055ddd215421bd36c2db8c789 /acprep
parent39ce225004e88d397ca3fd3ce2051d54eedaecc0 (diff)
downloadfork-ledger-14ab4f7775fe203e6e5cd2b9cb4d364c465c4e4e.tar.gz
fork-ledger-14ab4f7775fe203e6e5cd2b9cb4d364c465c4e4e.tar.bz2
fork-ledger-14ab4f7775fe203e6e5cd2b9cb4d364c465c4e4e.zip
Updated to Boost 1.50
Diffstat (limited to 'acprep')
-rwxr-xr-xacprep11
1 files changed, 7 insertions, 4 deletions
diff --git a/acprep b/acprep
index d5cbcddc..1c05596f 100755
--- a/acprep
+++ b/acprep
@@ -99,7 +99,7 @@ class CommandLineApp(object):
force_exit = True # If true, always ends run() with sys.exit()
log_handler = None
- boost_major = "1_49"
+ boost_major = "1_50"
options = {
'debug': False,
@@ -674,14 +674,17 @@ class PrepareBuild(CommandLineApp):
self.CXXFLAGS.append('-Wno-disabled-macro-expansion')
if self.current_flavor == 'opt':
- self.configure_args.append('-DCMAKE_CXX_FLAGS:STRING=-O4')
- self.configure_args.append('-DCMAKE_CXX_LINK_FLAGS:STRING=-O4')
+ self.configure_args.append('-DCMAKE_CXX_FLAGS_RELEASE:STRING=-O4')
+ self.configure_args.append('-DCMAKE_CXX_LINK_FLAGS_RELEASE:STRING=-O4')
+ #else:
+ # self.CXXFLAGS.append('-g -O1 -faddress-sanitizer')
+ # self.LDFLAGS.append('-g -O1 -faddress-sanitizer')
self.configure_args.append('-DCMAKE_INCLUDE_PATH:STRING=/usr/local/include;/opt/local/include')
self.configure_args.append('-DCMAKE_LIBRARY_PATH:STRING=/usr/local/lib;/opt/local/lib')
self.configure_args.append('-DBOOST_ROOT=/usr/local')
- self.configure_args.append('-DBOOST_INCLUDEDIR=/usr/local/include/boost-1_49')
+ self.configure_args.append('-DBOOST_INCLUDEDIR=/usr/local/include/boost-1_50')
self.configure_args.append('-DBoost_COMPILER=-clang-darwin')
self.configure_args.append(self.source_dir)