diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/lib/Makefile b/lib/Makefile index 06d4da93..bc9611f0 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -5,27 +5,27 @@ STOW_ROOT = /usr/local/stow PRODUCTS = $(HOME)/Products -GCC_VERSION = 4.6 -BOOST_VERSION = 1_46_1 +GCC_VERSION = 4.6 +BOOST_VERSION = 1_47_0 CC = gcc-mp-$(GCC_VERSION) ifeq ($(CC),clang) CXX = clang++ LD = llvm-ld DIR_SUFFIX = clang -OPTJ = +OPTJ = else CXX = g++-mp-$(GCC_VERSION) LD = gcc-mp-$(GCC_VERSION) DIR_SUFFIX = gcc$(subst .,,$(GCC_VERSION)) -OPTJ = #-j8 +OPTJ = #-j8 endif CPPFLAGS = -D_GLIBCXX_FULLY_DYNAMIC_STRING=1 ifneq ($(CC),clang) CPPFLAGS += -D_GLIBCXX_DEBUG=1 endif -CFLAGS = $(CPPFLAGS) -g -LDFLAGS = -g +CFLAGS = $(CPPFLAGS) -g2 -ggdb +LDFLAGS = -g2 -ggdb BOOST_SOURCE = boost-release BOOST_DEFINES = define=_GLIBCXX_FULLY_DYNAMIC_STRING=1 @@ -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) @@ -51,12 +50,12 @@ all: boost-build #icu-build boost-icu-build prepare-boost: perl -i -pe 's/local command = \[ common\.get-invocation-command darwin : g\+\+ : .*/local command = [ common.get-invocation-command darwin : g++ : $(CXX) ] ;/;' $(BOOST_SOURCE)/tools/build/v2/tools/darwin.jam - perl -i -pe 's/flags darwin\.compile OPTIONS : -no-cpp-precomp -gdwarf-2 ;/flags darwin\.compile OPTIONS : -gdwarf-2 ;/;' $(BOOST_SOURCE)/tools/build/v2/tools/darwin.jam + perl -i -pe 's/flags darwin\.compile OPTIONS : -no-cpp-precomp -gdwarf-2 (-fexceptions )?;/flags darwin\.compile OPTIONS : -gdwarf-2 \1;/;' $(BOOST_SOURCE)/tools/build/v2/tools/darwin.jam 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) |