diff options
| -rwxr-xr-x | acprep | 9 | ||||
| -rw-r--r-- | lib/Makefile | 13 |
2 files changed, 11 insertions, 11 deletions
@@ -254,8 +254,8 @@ class CommandLineApp(object): force_exit = True # If true, always ends run() with sys.exit() log_handler = None darwin_gcc = False - boost_version = "1_47_0" - boost_major = "1_47" + boost_version = "1_48_0" + boost_major = "1_48" options = { 'debug': False, @@ -1281,8 +1281,9 @@ class PrepareBuild(CommandLineApp): def locate_darwin_libraries(self): if self.current_flavor == 'debug': if self.options.use_glibcxx_debug and not self.options.use_clang: - self.log.debug('We are using GLIBCXX_DEBUG, so setting up flags') - self.CPPFLAGS.append('-D_GLIBCXX_DEBUG=1') + #self.log.debug('We are using GLIBCXX_DEBUG, so setting up flags') + #self.CPPFLAGS.append('-D_GLIBCXX_DEBUG=1') + pass if self.boost_info.configure( home_path = '/usr/local/stow/boost_%s-%s' % \ 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) |