summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-04-10 11:38:31 +0200
committerMichael Stahl <mstahl@redhat.com>2017-04-10 13:42:48 +0200
commitfae4b8d79819e205b1746014c770d5fb13d86e22 (patch)
tree402f10891c0d49d36fe6c49663edccd0c21ed19a /solenv
parent6bd33bd263c6666824d0d540395a4df4ae7d1d7b (diff)
gbuild: revert to -O0 instead of -Og for GCC --enable-debug/dbgutil builds
Unfortunately -Og doesn't work as well as advertised, variables are optimized away too often. See thread at https://lists.freedesktop.org/archives/libreoffice/2017-April/077479.html Change-Id: I5fc141ea9c7c6931aaf8220c7abf6b413326049e
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/platform/com_GCC_defs.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 25125334840c..6b697fc9461c 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -186,9 +186,7 @@ ifeq ($(HAVE_GCC_FNO_DEFAULT_INLINE),TRUE)
FNO_DEFAULT_INLINE=-fno-default-inline
endif
-# note: this overrides -O0 from the gb_COMPILERNOOPTFLAGS with -Og if
-# available, so that the former remains no-optimization for when that is needed
-gb_DEBUG_CFLAGS := $(if $(HAVE_GCC_OG),-Og) $(FINLINE_LIMIT0) $(FNO_INLINE)
+gb_DEBUG_CFLAGS := $(FINLINE_LIMIT0) $(FNO_INLINE)
gb_DEBUG_CXXFLAGS := $(FNO_DEFAULT_INLINE)