diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-01-24 08:32:40 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-01-24 11:25:03 +0100 |
| commit | c2216d2d7a5bb0a82f79181fbc46708d35858afe (patch) | |
| tree | d5391df6f89e4e3c24a49d31a834c38ce1354699 /solenv | |
| parent | dc3936f598e828294311ceee738b4d8d3d46cf9e (diff) | |
Drop unnecessary gb_DEBUG_CFLAGS
...which was at maximum set to GCC's -finline-limit=0 -fno-inline
(solenv/gbuild/platform/com_GCC_defs.mk). Those options were set for debug
builds "since forever", but that looks very much like cargo cult: -fno-inline
"is the default when not optimizing" anyway
(<https://gcc.gnu.org/onlinedocs/gcc-7.4.0/gcc/Optimize-Options.html>), and it
is unclear to me how -finline-limit=0 should have any impact beyond -fno-inline
(and maybe was present for ancient compilers that only supported -finline-limit
but not -fno-inline?).
Change-Id: Id6752d03b1b7ec8763defabc5720d4dd08790874
Reviewed-on: https://gerrit.libreoffice.org/66836
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 10 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/iOS.mk | 2 |
4 files changed, 1 insertions, 15 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index b9ea5f55ec3d..0c79c73fcb46 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -44,7 +44,7 @@ gb_LinkTarget__debug_enabled = \ # debug flags, if ENABLE_DEBUG is set and the LinkTarget is named # in the list of libraries of ENABLE_DEBUGINFO_FOR -gb_LinkTarget__get_debugflags=$(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(call gb_LinkTarget__debug_enabled,$(1)),$(gb_DEBUG_CFLAGS)) $(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS)) +gb_LinkTarget__get_debugflags=$(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS)) # similar for LDFLAGS, use linker optimization flags in non-debug case, # but moreover strip debug from libraries for which debuginfo is not wanted diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 5698e70d53f8..b780358dbe4e 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -204,16 +204,6 @@ ifeq ($(HAVE_GCC_SPLIT_DWARF),TRUE) gb_DEBUGINFO_FLAGS+=-gsplit-dwarf endif -ifeq ($(HAVE_GCC_FINLINE_LIMIT),TRUE) -FINLINE_LIMIT0=-finline-limit=0 -endif - -ifeq ($(HAVE_GCC_FNO_INLINE),TRUE) -FNO_INLINE=-fno-inline -endif - -gb_DEBUG_CFLAGS := $(FINLINE_LIMIT0) $(FNO_INLINE) - gb_LinkTarget_INCLUDE :=\ $(SOLARINC) \ -I$(BUILDDIR)/config_$(gb_Side) \ diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index e6afe0b5ad2a..1bb766f91da6 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -259,8 +259,6 @@ gb_DEBUGINFO_FLAGS := \ -FS \ -Zi \ -gb_DEBUG_CFLAGS := - gb_COMPILEROPTFLAGS := -O2 -Oy- gb_COMPILERNOOPTFLAGS := -Od diff --git a/solenv/gbuild/platform/iOS.mk b/solenv/gbuild/platform/iOS.mk index 6e5e20c0295b..05f7e65781b5 100644 --- a/solenv/gbuild/platform/iOS.mk +++ b/solenv/gbuild/platform/iOS.mk @@ -62,8 +62,6 @@ gb_OBJCFLAGS := -x objective-c gb_COMPILERDEFS += \ -DBOOST_DETAIL_NO_CONTAINER_FWD -gb_DEBUG_CFLAGS := -fno-inline - # LinkTarget class gb_LinkTarget_CFLAGS := $(gb_CFLAGS) |