[Libreoffice-commits] core.git: bridges/Library_cpp_uno.mk

[David Ostrovsky]

 bridges/Library_cpp_uno.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1b218f3597092affab8846a9ed96d83cb204707f
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Mon Nov 2 20:56:32 2015 +0100

    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 at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 57d5f8b..4411eb2 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,\