Kaydet (Commit) a5a5104c authored tarafından Michael Stahl's avatar Michael Stahl

gbuild: --enable-dbgutil: enable STL assertions for Mac OS X

Works here with Apple llvm-g++ 4.2.1; cannot run "subsequentcheck"
due to remote login.

Change-Id: I187620b65f82095b5e9b7433c01ede429a27c719
üst f14f7a2e
...@@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) : ...@@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) :
$(if $(filter WNT,$(OS)),LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \ $(if $(filter WNT,$(OS)),LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \
$(if $(filter SOLARIS,$(OS)),LIBS="-lm") \ $(if $(filter SOLARIS,$(OS)),LIBS="-lm") \
$(if $(filter ANDROID,$(OS)),LIBS="-lgnustl_shared -lm") \ $(if $(filter ANDROID,$(OS)),LIBS="-lgnustl_shared -lm") \
CXXFLAGS="$(if $(filter GCC,$(COM)),$(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS)),$(if $(filter TRUE,$(ENABLE_DBGUTIL)),-D_GLIBCXX_DEBUG),$(if $(filter WNT,$(OS)),-mthreads))) \ CXXFLAGS="$(if $(filter GCC,$(COM)),$(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID MACOSX,$(OS)),$(if $(filter TRUE,$(ENABLE_DBGUTIL)),-D_GLIBCXX_DEBUG),$(if $(filter WNT,$(OS)),-mthreads))) \
$(if $(debug),-g)" \ $(if $(debug),-g)" \
&& cd src \ && cd src \
&& $(MAKE) \ && $(MAKE) \
......
...@@ -50,7 +50,7 @@ endif ...@@ -50,7 +50,7 @@ endif
ifeq ($(SYSTEM_ZLIB),NO) ifeq ($(SYSTEM_ZLIB),NO)
liborcus_CPPFLAGS+=-I$(OUTDIR)/inc/external/zlib liborcus_CPPFLAGS+=-I$(OUTDIR)/inc/external/zlib
endif endif
ifneq (,$(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS))) ifneq (,$(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID MACOSX,$(OS)))
ifneq (,$(gb_ENABLE_DBGUTIL)) ifneq (,$(gb_ENABLE_DBGUTIL))
liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG
endif endif
......
...@@ -77,6 +77,13 @@ gb_COMPILERDEFS += \ ...@@ -77,6 +77,13 @@ gb_COMPILERDEFS += \
endif endif
# enable debug STL
ifeq ($(gb_ENABLE_DBGUTIL),$(true))
gb_COMPILERDEFS += \
-D_GLIBCXX_DEBUG \
endif
ifeq ($(HAVE_GCC_NO_LONG_DOUBLE),TRUE) ifeq ($(HAVE_GCC_NO_LONG_DOUBLE),TRUE)
gb_CXXFLAGS += -Wno-long-double gb_CXXFLAGS += -Wno-long-double
endif endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment