diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-04-13 19:16:54 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-04-13 20:08:36 +0200 |
| commit | e7f9da36198bb53aec2ed0c492cb723bec98f29b (patch) | |
| tree | 85787314a20c80d5ca39ad8e61fa1ac68f0d8eb1 | |
| parent | 9030ffb1a1b282eb2c6d1773930b0de0d42df447 (diff) | |
Pass to linker its debuginfo options, not compiler's
... follow-up to commits 65f27f55cbb5994fbabe9716a92ea4d3f20e3e54 and
eeeec33ada5923f1f534334b22c15d6e2c6f1d35
Otherwise, e.g. on Windows, linker complains about unknown options /FS
and /Zi, and doesn't link debug info, making debug build useless.
Change-Id: I256a463b4b4e4bb339c94a393c9b1d17e85b7a3f
Reviewed-on: https://gerrit.libreoffice.org/70713
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 3e2d19e58956..d1e5b9a7c644 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__symbols_enabled,$(1)),$(gb_DEBUGINFO_FLAGS),$(gb_LINKEROPTFLAGS) $(call gb_LinkTarget__get_stripldflags,$(1))) +gb_LinkTarget__get_debugldflags=$(if $(call gb_LinkTarget__symbols_enabled,$(1)),$(gb_LINKER_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 |