[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - solenv/gbuild

[Damjan Jovanovic]

 solenv/gbuild/GoogleTest.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e3078772c4366e1bc09aa1fbbe0bdd80256ebb89
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Fri Jun 10 17:34:38 2016 +0000

    Fix a typo in my last patch.
    
    Patch by: me

diff --git a/solenv/gbuild/GoogleTest.mk b/solenv/gbuild/GoogleTest.mk
index 90df2a5..d52178c 100644
--- a/solenv/gbuild/GoogleTest.mk
+++ b/solenv/gbuild/GoogleTest.mk
@@ -27,7 +27,7 @@
 # in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell
 DBGSV_ERROR_OUT := shell
 export DBGSV_ERROR_OUT
-DISABLE_SAL_DBGBOX=1
+DISABLE_SAL_DBGBOX := 1
 export DISABLE_SAL_DBGBOX
 
 # defined by platform
commit dc8b714d2345e42b48a09cbd6affe74c6994b5fc
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Fri Jun 10 17:31:51 2016 +0000

    #i126918# - windows build breaks in module crashrep - Assertion Failed
    
    Prevent OSL assertion failures from bringing up messageboxes during
    the build on Windows.
    
    Patch by: me

diff --git a/solenv/gbuild/GoogleTest.mk b/solenv/gbuild/GoogleTest.mk
index b8cf828..90df2a5 100644
--- a/solenv/gbuild/GoogleTest.mk
+++ b/solenv/gbuild/GoogleTest.mk
@@ -27,6 +27,8 @@
 # in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell
 DBGSV_ERROR_OUT := shell
 export DBGSV_ERROR_OUT
+DISABLE_SAL_DBGBOX=1
+export DISABLE_SAL_DBGBOX
 
 # defined by platform
 #  gb_CppunitTest_TARGETTYPE