diff options
| author | John Wiegley <johnw@newartisans.com> | 2011-11-15 13:20:57 -0600 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2011-11-15 13:20:57 -0600 |
| commit | 7112ff5d56af6db2418a210f39396e3f79e1369e (patch) | |
| tree | 62d513a31a86e08890fa93a7e5b038b4d0a271fc /lib | |
| parent | c2c11d43ca14aad1884ab6efc4637245a4c16746 (diff) | |
| download | fork-ledger-7112ff5d56af6db2418a210f39396e3f79e1369e.tar.gz fork-ledger-7112ff5d56af6db2418a210f39396e3f79e1369e.tar.bz2 fork-ledger-7112ff5d56af6db2418a210f39396e3f79e1369e.zip | |
Default to using Boost 1.48, without _GLIBCXX_DEBUG
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/Makefile b/lib/Makefile index bc9611f0..aa7ff9eb 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -6,7 +6,7 @@ STOW_ROOT = /usr/local/stow PRODUCTS = $(HOME)/Products GCC_VERSION = 4.6 -BOOST_VERSION = 1_47_0 +BOOST_VERSION = 1_48_0 CC = gcc-mp-$(GCC_VERSION) ifeq ($(CC),clang) @@ -21,9 +21,9 @@ DIR_SUFFIX = gcc$(subst .,,$(GCC_VERSION)) OPTJ = #-j8 endif CPPFLAGS = -D_GLIBCXX_FULLY_DYNAMIC_STRING=1 -ifneq ($(CC),clang) -CPPFLAGS += -D_GLIBCXX_DEBUG=1 -endif +#ifneq ($(CC),clang) +#CPPFLAGS += -D_GLIBCXX_DEBUG=1 +#endif CFLAGS = $(CPPFLAGS) -g2 -ggdb LDFLAGS = -g2 -ggdb @@ -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) --layout=versioned \ @@ -56,8 +56,7 @@ boost-build: prepare-boost (cd $(BOOST_SOURCE) && \ sh bootstrap.sh && \ ./b2 $(OPTJ) debug --prefix=$(BOOST_STOW) \ - --build-dir=$(BOOST_BUILD) \ - $(BOOST_FLAGS) install) + --build-dir=$(BOOST_BUILD) $(BOOST_FLAGS) install) icu-build: -(cd icu/source; make distclean) |