diff options
| -rwxr-xr-x | acprep | 8 | ||||
| -rw-r--r-- | lib/Makefile | 2 | ||||
| -rw-r--r-- | src/textual.cc | 4 | ||||
| -rwxr-xr-x | tools/build.sh | 1 |
4 files changed, 11 insertions, 4 deletions
@@ -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 ; \ |