diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-11-02 20:56:32 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-11-02 20:36:07 +0000 |
| commit | 1b218f3597092affab8846a9ed96d83cb204707f (patch) | |
| tree | 5c07cec378c1459d1549b4f0778d085c86ec94aa /bridges | |
| parent | f462cd39b990929bc71615f7f04d561d64c1039d (diff) | |
Pass emit-debuginfo flags to MSVC bridge_noopt_objects, if applicable
Since df62a2c81bef2bcd96a5f14802e41815f0bdc2da 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/19744
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/Library_cpp_uno.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index 57d5f8bb0970..4411eb2bd0a3 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -241,7 +241,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) $(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),\ $(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\ |