solenv/gbuild/LinkTarget.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit ad3f2bd585706d0880b75c8cbf8302104756dc3c Author: LuboÅ¡ LuÅák <l.lu...@suse.cz> Date: Wed Oct 31 14:01:42 2012 +0100 do not strip debuginfo if any explicit C(XX)FLAGS have been given Because there may be -g explicitly specified there. This is in line with using buildsystem's -O/-g flags only if nothing has been explicitly specified. Change-Id: If0309b6a7c52de19c4903978108e4e24362d3351 diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index ba91d4a..4b47c83 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -50,7 +50,7 @@ gb_LinkTarget__get_debugcxxflags=$(if $(call gb_LinkTarget__debug_enabled,$(1)), # similar for LDFLAGS, use linker optimization flags in non-debug case, # 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 $(call gb_LinkTarget__debug_enabled,$(1)),,$(gb_LINKERSTRIPDEBUGFLAGS)) +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))) # generic cflags/cxxflags to use (optimization flags, debug flags)
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits