external/gpgmepp/ExternalProject_gpgmepp.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 8976e546909be0e523dbaf6581c53c1d5b44a1d0
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date:   Thu Dec 7 22:21:49 2017 +0100

    gpg4libre: also pass proper dbgutil flags down to gpgmepp
    
    Change-Id: I63ca514b6bf7e1316ebbaa3cd399fd9f9447bc7f
    Reviewed-on: https://gerrit.libreoffice.org/46049
    Reviewed-by: Michael Stahl <mst...@redhat.com>
    Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk 
b/external/gpgmepp/ExternalProject_gpgmepp.mk
index a10d41556b0c..ec865fcb2ca8 100644
--- a/external/gpgmepp/ExternalProject_gpgmepp.mk
+++ b/external/gpgmepp/ExternalProject_gpgmepp.mk
@@ -62,7 +62,8 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build):
                   CXXFLAGS='$(CXXFLAGS) \
                                $(if $(ENABLE_OPTIMIZED), \
                                        
$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
-                               $(if $(ENABLE_DEBUG),$(gb_DEBUG_CXXFLAGS) 
-D_GLIBCXX_DEBUG) \
+                               $(if $(ENABLE_DEBUG),$(gb_DEBUG_CXXFLAGS)) \
+                               $(if $(ENABLE_DBGUTIL),-D_GLIBCXX_DEBUG) \
                                $(if $(filter 
$(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \
                   $(if $(filter LINUX,$(OS)), \
                                'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to