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

[Noel Grandin (via logerrit)]

 solenv/gbuild/platform/macosx.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c6104462fbe11ae053155b5f6c2ec52d31f0481c
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sat Sep 5 18:24:24 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Sep 5 20:45:38 2020 +0200

    fix macOS malloc debugging
    
    which was introduced with insufficient testing in
        commit 302d85a931586313e04f82d206970dbc3bce9a47
        add macOS malloc debugging env vars
    
    And this fix also avoids the potential problem of turning
    on malloc debugging for lldb itself.
    
    Change-Id: I0d65cefbd3ce8aea7223c6f0a3470b7ecbc8da89
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102082
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 431f8e4b45fc..101251952e4b 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -261,7 +261,7 @@ gb_CppunitTest_CPPTESTPRECOMMAND := \
 	$(call gb_Helper_extend_ld_path,$(gb_Library_DLLDIR):$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs)
 gb_CppunitTest_get_filename = libtest_$(1).dylib
 gb_CppunitTest_get_ilibfilename = $(gb_CppunitTest_get_filename)
-gb_CppunitTest_malloc_check := MallocScribble=1 MallocPreScribble=1
+gb_CppunitTest_malloc_check := -o "env MallocScribble=1" -o "env MallocPreScribble=1"
 
 define gb_CppunitTest_CppunitTest_platform
 $(call gb_LinkTarget_get_target,$(2)) : RPATH :=