Kaydet (Commit) 65f27f55 authored tarafından Luboš Luňák's avatar Luboš Luňák

--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: 's avatarLuboš Luňák <l.lunak@collabora.com>
üst e7a88399
......@@ -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
......
......@@ -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) \
......
......@@ -259,6 +259,8 @@ gb_DEBUGINFO_FLAGS := \
-FS \
-Zi \
gb_LINKER_DEBUGINFO_FLAGS=
gb_COMPILEROPTFLAGS := -O2 -Oy-
gb_COMPILERNOOPTFLAGS := -Od
......
......@@ -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.
......
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