Kaydet (Commit) 1b218f35 authored tarafından David Ostrovsky's avatar David Ostrovsky Kaydeden (comit) Michael Stahl

Pass emit-debuginfo flags to MSVC bridge_noopt_objects, if applicable

Since df62a2c8 gb_DEBUG_CFLAGS
was passed to bridge_noopt_objects target for MSVC to track
down EH breakage on 64 bit architecture. It was erroneously
done unconditionally. Fix it to only pass when one of:

--enable-dbgutil
--enable-debug
--enable-symbols

is present.

Change-Id: I2728c30156541be418c88a0ea284c0c6a16abba5
Reviewed-on: https://gerrit.libreoffice.org/19744Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst f462cd39
...@@ -241,7 +241,7 @@ $(foreach obj,$(bridge_noncallexception_objects),\ ...@@ -241,7 +241,7 @@ $(foreach obj,$(bridge_noncallexception_objects),\
$(foreach obj,$(bridge_noopt_objects),\ $(foreach obj,$(bridge_noopt_objects),\
$(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\ $(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\
bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj) \ bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj) \
, $(gb_COMPILERNOOPTFLAGS) $(if $(filter MSC,$(COM)),$(gb_DEBUG_CFLAGS),$(bridges_DEBUGINFO_FLAGS)) $(gb_LinkTarget_EXCEPTIONFLAGS))) \ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) $(bridges_DEBUGINFO_FLAGS))) \
) )
$(foreach obj,$(bridge_noncallexception_noopt_objects),\ $(foreach obj,$(bridge_noncallexception_noopt_objects),\
$(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\ $(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\
......
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