diff options
| author | John Wiegley <johnw@newartisans.com> | 2011-09-08 01:02:06 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2011-09-08 01:02:06 -0500 |
| commit | d353f4fa009f6086f2be705c141ce9dc6fa7ffa7 (patch) | |
| tree | ff06b72bc7b3703c3f68e88674ec0687f3283395 /lib/Makefile | |
| parent | d14074b612d00ab51f746a3a5a3d92c7f44ac7e5 (diff) | |
| download | fork-ledger-d353f4fa009f6086f2be705c141ce9dc6fa7ffa7.tar.gz fork-ledger-d353f4fa009f6086f2be705c141ce9dc6fa7ffa7.tar.bz2 fork-ledger-d353f4fa009f6086f2be705c141ce9dc6fa7ffa7.zip | |
Use gcc 4.6 with Boost 1.47
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/Makefile b/lib/Makefile index c6445b78..bc9611f0 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -5,7 +5,7 @@ STOW_ROOT = /usr/local/stow PRODUCTS = $(HOME)/Products -GCC_VERSION = 4.5 +GCC_VERSION = 4.6 BOOST_VERSION = 1_47_0 CC = gcc-mp-$(GCC_VERSION) @@ -36,9 +36,8 @@ BOOST_TOOLSET = darwin BOOST_DEFINES += define=_GLIBCXX_DEBUG=1 endif #BOOST_FLAGS = --architecture=x86 --address_model=32_64 -BOOST_FLAGS = toolset=$(BOOST_TOOLSET) \ - --build-type=complete --layout=versioned \ - $(BOOST_DEFINES) +BOOST_FLAGS = toolset=$(BOOST_TOOLSET) --layout=versioned \ + link=shared threading=single $(BOOST_DEFINES) BOOST_DIR = boost_$(BOOST_VERSION)-$(DIR_SUFFIX) BOOST_STOW = $(STOW_ROOT)/$(BOOST_DIR) BOOST_BUILD = $(PRODUCTS)/$(BOOST_DIR) @@ -56,7 +55,7 @@ prepare-boost: boost-build: prepare-boost (cd $(BOOST_SOURCE) && \ sh bootstrap.sh && \ - ./bjam $(OPTJ) debug --prefix=$(BOOST_STOW) \ + ./b2 $(OPTJ) debug --prefix=$(BOOST_STOW) \ --build-dir=$(BOOST_BUILD) \ $(BOOST_FLAGS) install) |