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

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Fri Sep 4 17:03:36 UTC 2020


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

New commits:
commit 5f7cbf60b71e78d4a980ec46953c4524ec0fd80c
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Sep 4 16:46:38 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Sep 4 19:02:55 2020 +0200

    revert the macos part of..
    
    commit 217122387f6e0ef657b8ba85eae082b448901cec
        Date:   Tue Aug 25 12:23:13 2020 +0200
        dont turn on malloc debugging for gdb itself
    
    because it doesn't work
    
    Change-Id: If6f1ac2ddc1683dab9d57df742c647083304af07
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102056
    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 863fc4370103..431f8e4b45fc 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 := -Q 'env MallocScribble=1' -Q 'env MallocPreScribble=1'
+gb_CppunitTest_malloc_check := MallocScribble=1 MallocPreScribble=1
 
 define gb_CppunitTest_CppunitTest_platform
 $(call gb_LinkTarget_get_target,$(2)) : RPATH :=


More information about the Libreoffice-commits mailing list