Unconditionally include gb_DEBUG_CFLAGS in MSVC bridge_noopt_objects?

Stephan Bergmann sbergman at redhat.com
Mon Nov 2 08:18:07 PST 2015


Given gb_DEBUG_CFLAGS is always set to the relevant "emit debuginfo" 
flags (/Zi, possibly plus /FS, on MSVC), independently of any 
--enable-dbgutil/-debug/-symbols configuration:  Was the below commit 
really intended to be that way?  Or did it rather want to add those 
"emit debuginfo" flags *when doing (any sort of) a debug build* only?

> commit df62a2c81bef2bcd96a5f14802e41815f0bdc2da
> Author: David Ostrovsky <david at ostrovsky.org>
> Date:   Mon Dec 8 08:17:03 2014 +0100
>
>     Uno bridge: Apply debug info setting to noopt code
>
>     Change-Id: Id949718baf77bb7e2d276d3db08f68149c114796
>     Reviewed-on: https://gerrit.libreoffice.org/13364
>     Reviewed-by: David Ostrovsky <david at ostrovsky.org>
>     Tested-by: David Ostrovsky <david at ostrovsky.org>
>
> diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
> index 5b7377a..5d9454c 100644
> --- a/bridges/Library_cpp_uno.mk
> +++ b/bridges/Library_cpp_uno.mk
> @@ -229,7 +229,7 @@ $(foreach obj,$(bridge_noncallexception_objects),\
>  $(foreach obj,$(bridge_noopt_objects),\
>         $(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\
>         bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj) \
> -       , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS))) \
> +       , $(gb_COMPILERNOOPTFLAGS) $(if $(filter MSC,$(COM)),$(gb_DEBUG_CFLAGS)) $(gb_LinkTarget_EXCEPTIONFLAGS))) \
>  )
>  $(foreach obj,$(bridge_noncallexception_noopt_objects),\
>         $(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\


More information about the LibreOffice mailing list