sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next' into kitchen-sink

Browse source
This commit is contained in:
Craig Earls 2013-01-30 16:45:50 -07:00
commit 0e0f9973c7
4 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
acprep
View file

@ -99,7 +99,7 @@ class CommandLineApp(object):
force_exit = True # If true, always ends run() with sys.exit() force_exit = True # If true, always ends run() with sys.exit()
log_handler = None log_handler = None
boost_major = "1_50" boost_major = "1_52"
def __init__(self): def __init__(self):
"Initialize CommandLineApp." "Initialize CommandLineApp."
@ -660,8 +660,10 @@ class PrepareBuild(CommandLineApp):
self.configure_args.append('-DCMAKE_CXX_COMPILER:PATH=/usr/local/bin/clang++') self.configure_args.append('-DCMAKE_CXX_COMPILER:PATH=/usr/local/bin/clang++')
if self.current_flavor == 'opt': if self.current_flavor == 'opt':
self.configure_args.append('-DCMAKE_CXX_FLAGS_RELEASE:STRING=-O4') self.configure_args.append('-DCMAKE_CXX_FLAGS_RELEASE:STRING=-O3')
self.configure_args.append('-DCMAKE_CXX_LINK_FLAGS_RELEASE:STRING=-O4') 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: #else:
# self.CXXFLAGS.append('-g -O1 -faddress-sanitizer') # self.CXXFLAGS.append('-g -O1 -faddress-sanitizer')
# self.LDFLAGS.append('-g -O1 -faddress-sanitizer') # self.LDFLAGS.append('-g -O1 -faddress-sanitizer')

2
lib/Makefile
View file

@ -6,7 +6,7 @@ STOW_ROOT = /usr/local/Cellar/boost
PRODUCTS = $(HOME)/Products PRODUCTS = $(HOME)/Products
GCC_VERSION = 4.7 GCC_VERSION = 4.7
BOOST_VERSION = 1_50_0 BOOST_VERSION = 1_52_0
CC = gcc-mp-$(GCC_VERSION) CC = gcc-mp-$(GCC_VERSION)
ifeq ($(CC),clang) ifeq ($(CC),clang)

4
src/textual.cc
View file

@ -282,6 +282,10 @@ void instance_t::parse()
} }
} }
#if defined(TIMELOG_SUPPORT)
timelog.close();
#endif // TIMELOG_SUPPORT
TRACE_STOP(instance_parse, 1); TRACE_STOP(instance_parse, 1);
} }

1
tools/build.sh
View file

@ -5,6 +5,7 @@ shift 1
JOBS=-j$(sysctl -n hw.activecpu) JOBS=-j$(sysctl -n hw.activecpu)
OPTIONS="$flavor --debug --python --ninja --doxygen $JOBS" OPTIONS="$flavor --debug --python --ninja --doxygen $JOBS"
OPTIONS="$OPTIONS --prefix /usr/local/Cellar/ledger/HEAD"
time ( \ time ( \
cd ~/src/ledger ; \ cd ~/src/ledger ; \