diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-04-04 16:19:54 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-04-11 12:18:32 +0200 |
| commit | 65f27f55cbb5994fbabe9716a92ea4d3f20e3e54 (patch) | |
| tree | 0659fe2a930993f9134c72915ca3bf5179bacb00 | |
| parent | e7a883994723d7002a92d777734aafefb2d18763 (diff) | |
--gdb-index flags should be used only when linking with symbols
Change-Id: I32681fd56367c583efc55ab11c0bc59aaf845b86
Reviewed-on: https://gerrit.libreoffice.org/70367
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 12 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/iOS.mk | 1 |
4 files changed, 10 insertions, 7 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 3292c26bcde2..85804ca8bcc5 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -50,7 +50,7 @@ gb_LinkTarget__get_debugflags=$(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$( # but moreover strip debug from libraries for which debuginfo is not wanted # (some libraries reuse .o files from other libraries, notably unittests) gb_LinkTarget__get_stripldflags=$(if $(strip $(CFLAGS)$(CXXFLAGS)$(OBJCFLAGS)$(OBJCXXFLAGS)$(LDFLAGS)),,$(gb_LINKERSTRIPDEBUGFLAGS)) -gb_LinkTarget__get_debugldflags=$(if $(call gb_LinkTarget__debug_enabled,$(1)),,$(gb_LINKEROPTFLAGS) $(call gb_LinkTarget__get_stripldflags,$(1))) +gb_LinkTarget__get_debugldflags=$(if $(call gb_LinkTarget__debug_enabled,$(1)),$(gb_DEBUGINFO_FLAGS),$(gb_LINKEROPTFLAGS) $(call gb_LinkTarget__get_stripldflags,$(1))) # generic cflags/cxxflags to use (optimization flags, debug flags) # user supplied CFLAGS/CXXFLAGS override default debug/optimization flags diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index b780358dbe4e..28bb7138d0d7 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -85,12 +85,6 @@ endif gb_CXXFLAGS_Wundef = -Wno-undef -ifeq ($(ENABLE_GDB_INDEX),TRUE) -gb_LinkTarget_LDFLAGS += -Wl,--gdb-index -gb_CFLAGS_COMMON += -ggnu-pubnames -gb_CXXFLAGS_COMMON += -ggnu-pubnames -endif - ifeq ($(strip $(gb_GCOV)),YES) gb_CFLAGS_COMMON += -fprofile-arcs -ftest-coverage gb_CXXFLAGS_COMMON += -fprofile-arcs -ftest-coverage @@ -199,11 +193,17 @@ gb_DEBUGINFO_FLAGS=-ggdb2 else gb_DEBUGINFO_FLAGS=-g2 endif +gb_LINKER_DEBUGINFO_FLAGS= ifeq ($(HAVE_GCC_SPLIT_DWARF),TRUE) gb_DEBUGINFO_FLAGS+=-gsplit-dwarf endif +ifeq ($(ENABLE_GDB_INDEX),TRUE) +gb_LINKER_DEBUGINFO_FLAGS += -Wl,--gdb-index +gb_DEBUGINFO_FLAGS += -ggnu-pubnames +endif + 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 1bb766f91da6..300a047f352d 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -259,6 +259,8 @@ gb_DEBUGINFO_FLAGS := \ -FS \ -Zi \ +gb_LINKER_DEBUGINFO_FLAGS= + gb_COMPILEROPTFLAGS := -O2 -Oy- gb_COMPILERNOOPTFLAGS := -Od diff --git a/solenv/gbuild/platform/iOS.mk b/solenv/gbuild/platform/iOS.mk index 05f7e65781b5..abdeb8cc59e7 100644 --- a/solenv/gbuild/platform/iOS.mk +++ b/solenv/gbuild/platform/iOS.mk @@ -30,6 +30,7 @@ include $(GBUILDDIR)/platform/com_GCC_defs.mk # Use standard lldb debugger gb_DEBUGINFO_FLAGS=-g +gb_LINKER_DEBUGINFO_FLAGS= # Darwin mktemp -t expects a prefix, not a pattern gb_MKTEMP := /usr/bin/mktemp -t gbuild. |