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

[Stephan Bergmann]

 solenv/gbuild/platform/macosx.mk |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 8c8dab48fc8bf1d8c3f0f5e5139323222a81406e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 12 22:43:07 2015 +0100

    Make "make debugrun" use lldb on Mac
    
    ...the way command line arguments for the debugee need to be passed to lldb with
    some JSON quoting looks really odd
    
    Change-Id: I11a74ee6f8969664e9ba1cd72d2e3723848ceea1

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 83091e1..0652062 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -308,10 +308,8 @@ gb_PythonTest_PRECOMMAND := $(gb_PythonTest_PRECOMMAND):$(WORKDIR)/UnpackedTarba
 # Module class
 
 define gb_Module_DEBUGRUNCOMMAND
-OFFICESCRIPT=$$($(gb_MKTEMP)) && \
-printf '%s\n' "set args --norestore --nologo '--accept=pipe,name=$(USER);urp;'" > $${OFFICESCRIPT} && \
-gdb -x $${OFFICESCRIPT} $(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice && \
-rm $${OFFICESCRIPT}
+lldb -f $(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice -- --norestore --nologo \
+    '"--accept=pipe,name=$(USER)\;urp"'
 endef
 
 # InstallModuleTarget class