summaryrefslogtreecommitdiff
path: root/lib/Makefile
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2011-03-30 14:50:36 -0400
committerJohn Wiegley <johnw@newartisans.com>2011-03-30 14:50:36 -0400
commit3896214336c880a8dcb13b79b01f616f25403919 (patch)
tree6a574b5d4e2f41067a1c8827e2acec2faf1d6b65 /lib/Makefile
parent487fb22535d7c3f3d3dbd51ddf30d7b7e9dc00ed (diff)
parent1820f12ef16534f30e888f44b6d6602268fffcb9 (diff)
downloadfork-ledger-3896214336c880a8dcb13b79b01f616f25403919.tar.gz
fork-ledger-3896214336c880a8dcb13b79b01f616f25403919.tar.bz2
fork-ledger-3896214336c880a8dcb13b79b01f616f25403919.zip
Merge branch 'next'
Diffstat (limited to 'lib/Makefile')
-rw-r--r--lib/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Makefile b/lib/Makefile
index fa81bb76..06d4da93 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -33,7 +33,7 @@ ifeq ($(CC),clang)
BOOST_TOOLSET = clang
else
BOOST_TOOLSET = darwin
-BOOST_DEFINES = define=_GLIBCXX_DEBUG=1
+BOOST_DEFINES += define=_GLIBCXX_DEBUG=1
endif
#BOOST_FLAGS = --architecture=x86 --address_model=32_64
BOOST_FLAGS = --toolset=$(BOOST_TOOLSET) \