diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-04-04 16:39:49 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-04-11 12:20:55 +0200 |
| commit | eeeec33ada5923f1f534334b22c15d6e2c6f1d35 (patch) | |
| tree | b2514f295cea52bdbc1575c7dd7cf9e65caf2b86 /solenv/gbuild/platform | |
| parent | 4bbdab901eb3c7d32d28910fb830f4b0422eee91 (diff) | |
merge --enable-selective-debuginfo into --enable-symbols
This got broken again due to confusion about the interaction between
the various debug/symbol/whatever variables, so let's try to clean it
up once more. So gb_SYMBOLS or any other global flag is no more.
For checking whether a build target should get symbols, use
gb_LinkTarget__symbols_enabled, which is internally controlled by
gb_ENABLE_SYMBOLS_FOR (and flags from configure, command line or
wherever affect that).
This commit breaks the debug/nodebug split for PCH files, but fixing
that is a relatively separate and complex change, so it'll be done
in another commit.
Change-Id: I6060dd38684445bb761e664344fb530386481332
Reviewed-on: https://gerrit.libreoffice.org/70369
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'solenv/gbuild/platform')
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 5 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 4b2786df1856..a5059152a0cb 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -52,7 +52,7 @@ endef # CObject class -# $(call gb_CObject__command_pattern,object,flags,source,dep-file,compiler-plugins) +# $(call gb_CObject__command_pattern,object,flags,source,dep-file,compiler-plugins,symbols) define gb_CObject__command_pattern $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) $(dir $(4)) && cd $(SRCDIR) && \ diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 26ce2a51300b..30ebb82c7e39 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -34,7 +34,7 @@ endef # CObject class -# $(call gb_CObject__command_pattern,object,flags,source,dep-file,compiler-plugins) +# $(call gb_CObject__command_pattern,object,flags,source,dep-file,compiler-plugins,symbols) define gb_CObject__command_pattern $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) $(dir $(4)) && \ @@ -60,7 +60,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(filter YES,$(CXXOBJECT_X64)), -U_X86_ -D_AMD64_,) \ $(if $(filter YES,$(PE_X86)), -D_X86_ -U_AMD64_,) \ -c $(3) \ - -Fo$(1)) $(if $(filter $(true),$(gb_SYMBOL)),/link /DEBUG:FASTLINK) \ + -Fo$(1)) $(if $(filter $(true),$(6)),/link /DEBUG:FASTLINK) \ $(if $(COMPILER_TEST),,$(call gb_create_deps,$(4),$(1),$(3))) endef @@ -222,7 +222,6 @@ endef gb_Windows_PE_TARGETTYPEFLAGS := \ -release \ -opt:noref \ - $(if $(filter $(true),$(gb_SYMBOL)),-debug) \ $(if $(filter NO,$(LIBRARY_X64)), -safeseh) \ -nxcompat \ -dynamicbase \ diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 300a047f352d..b522f3e76572 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -259,7 +259,7 @@ gb_DEBUGINFO_FLAGS := \ -FS \ -Zi \ -gb_LINKER_DEBUGINFO_FLAGS= +gb_LINKER_DEBUGINFO_FLAGS := -debug gb_COMPILEROPTFLAGS := -O2 -Oy- gb_COMPILERNOOPTFLAGS := -Od |