diff options
| author | Craig Earls <enderw88@gmail.com> | 2011-10-06 22:07:01 -0700 |
|---|---|---|
| committer | Craig Earls <enderw88@gmail.com> | 2011-10-06 22:07:01 -0700 |
| commit | b400d65be082165f44e769605aa6a78133cf6d9a (patch) | |
| tree | 27b18ee35a5c4f60a10cf4f626e15ac30276040b /lib/Makefile | |
| parent | e9ccb012c2c5ffe0e9f4916ee859bda95d9d4248 (diff) | |
| parent | f0791bbd7297e737d9e13d0b0bb21473b173b2a7 (diff) | |
| download | fork-ledger-b400d65be082165f44e769605aa6a78133cf6d9a.tar.gz fork-ledger-b400d65be082165f44e769605aa6a78133cf6d9a.tar.bz2 fork-ledger-b400d65be082165f44e769605aa6a78133cf6d9a.zip | |
Merge remote branch 'upstream/next' into next
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Makefile b/lib/Makefile index e2d5dd2b..734816af 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -5,8 +5,8 @@ STOW_ROOT = /usr/local/stow PRODUCTS = $(HOME)/Products -GCC_VERSION = 4.6 -BOOST_VERSION = 1_46_1 +GCC_VERSION = 4.5 +BOOST_VERSION = 1_47_0 CC = gcc-mp-$(GCC_VERSION) ifeq ($(CC),clang) @@ -51,7 +51,7 @@ 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) && \ |