summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Earls <enderw88@gmail.com>2013-01-30 16:45:50 -0700
committerCraig Earls <enderw88@gmail.com>2013-01-30 16:45:50 -0700
commit0e0f9973c70ea4b026880e461a3a5024566cc19a (patch)
treec3416c163e9f13b1fdd2a5ccc3400375723e7aac
parentaeac4fe252954c21be0b6d2bac67ee74be77bf86 (diff)
parentb21ee1de170f99e8ed5c82546c8ae69e209bd8d6 (diff)
downloadfork-ledger-0e0f9973c70ea4b026880e461a3a5024566cc19a.tar.gz
fork-ledger-0e0f9973c70ea4b026880e461a3a5024566cc19a.tar.bz2
fork-ledger-0e0f9973c70ea4b026880e461a3a5024566cc19a.zip
Merge branch 'next' into kitchen-sink
-rwxr-xr-xacprep8
-rw-r--r--lib/Makefile2
-rw-r--r--src/textual.cc4
-rwxr-xr-xtools/build.sh1
4 files changed, 11 insertions, 4 deletions
diff --git a/acprep b/acprep
index ca718136..5cfd6710 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_50"
+ boost_major = "1_52"
def __init__(self):
"Initialize CommandLineApp."
@@ -660,8 +660,10 @@ class PrepareBuild(CommandLineApp):
self.configure_args.append('-DCMAKE_CXX_COMPILER:PATH=/usr/local/bin/clang++')
if self.current_flavor == 'opt':
- self.configure_args.append('-DCMAKE_CXX_FLAGS_RELEASE:STRING=-O4')
- self.configure_args.append('-DCMAKE_CXX_LINK_FLAGS_RELEASE:STRING=-O4')
+ self.configure_args.append('-DCMAKE_CXX_FLAGS_RELEASE:STRING=-O3')
+ self.configure_args.append('-DCMAKE_EXE_LINKER_FLAGS:STRING=-O3')
+ self.configure_args.append('-DCMAKE_SHARED_LINKER_FLAGS:STRING=-O3')
+ self.configure_args.append('-DCMAKE_MODULE_LINKER_FLAGS:STRING=-O3')
#else:
# self.CXXFLAGS.append('-g -O1 -faddress-sanitizer')
# self.LDFLAGS.append('-g -O1 -faddress-sanitizer')
diff --git a/lib/Makefile b/lib/Makefile
index 68755f18..ddbe0585 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -6,7 +6,7 @@ STOW_ROOT = /usr/local/Cellar/boost
PRODUCTS = $(HOME)/Products
GCC_VERSION = 4.7
-BOOST_VERSION = 1_50_0
+BOOST_VERSION = 1_52_0
CC = gcc-mp-$(GCC_VERSION)
ifeq ($(CC),clang)
diff --git a/src/textual.cc b/src/textual.cc
index 6106914f..b19ce79a 100644
--- a/src/textual.cc
+++ b/src/textual.cc
@@ -282,6 +282,10 @@ void instance_t::parse()
}
}
+#if defined(TIMELOG_SUPPORT)
+ timelog.close();
+#endif // TIMELOG_SUPPORT
+
TRACE_STOP(instance_parse, 1);
}
diff --git a/tools/build.sh b/tools/build.sh
index e79689e3..ba563e34 100755
--- a/tools/build.sh
+++ b/tools/build.sh
@@ -5,6 +5,7 @@ shift 1
JOBS=-j$(sysctl -n hw.activecpu)
OPTIONS="$flavor --debug --python --ninja --doxygen $JOBS"
+OPTIONS="$OPTIONS --prefix /usr/local/Cellar/ledger/HEAD"
time ( \
cd ~/src/ledger ; \