[Libreoffice-commits] core.git: solenv/gbuild

[Markus Mohrhard]

 solenv/gbuild/extensions/pre_MergedLibsList.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit bc93f460298891680f69d6f5bf935f26138c2e30
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed May 25 00:09:21 2016 +0200

    crash report lib should be part of mergelib
    
    Change-Id: I23c338f9fcf7eeea4a440013ea6c1b9206e040f3
    Reviewed-on: https://gerrit.libreoffice.org/25430
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index cd2a0df..8007f30 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -16,6 +16,7 @@ MERGE_LIBRARY_LIST := \
 	comphelper \
 	configmgr \
 	cppcanvas \
+	$(call gb_Helper_optional,BREAKPAD,crashreport) \
 	$(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \
 	deployment \
 	deploymentmisc \