[Libreoffice-commits] online.git: Makefile.am

Henry Castro (via logerrit) logerrit at kemper.freedesktop.org
Fri Mar 6 13:18:23 UTC 2020


 Makefile.am |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e99f0da28d7e00db98e6476d997eadd9be13e8c3
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Thu Mar 5 10:44:25 2020 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Fri Mar 6 14:18:05 2020 +0100

    wsd: makefile: allow to set GDB Front Ends
    
    Change-Id: I5b667938b25d8fe63d6c378cb383e357a071e134
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90022
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>

diff --git a/Makefile.am b/Makefile.am
index 9d04569b2..5a67a5faf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -303,6 +303,7 @@ if HAVE_LO_PATH
 
 SYSTEM_STAMP = @SYSTEMPLATE_PATH@/system_stamp
 CAPABILITIES = $(if @ENABLE_SETCAP@,true,false)
+RUN_GDB = $(if $(GDB_FRONTEND),$(GDB_FRONTEND),gdb --tui --args)
 
 $(SYSTEM_STAMP) : ${top_srcdir}/loolwsd-systemplate-setup
 	if test "z at SYSTEMPLATE_PATH@" != "z"; then rm -rf "@SYSTEMPLATE_PATH@"; fi
@@ -380,7 +381,7 @@ run-gdb: all @JAILS_PATH@
 	@cp $(abs_top_srcdir)/test/data/hello.odt $(abs_top_srcdir)/test/data/hello-world.odt
 	@cp $(abs_top_srcdir)/test/data/hello.ods $(abs_top_srcdir)/test/data/hello-world.ods
 	@cp $(abs_top_srcdir)/test/data/hello.odp $(abs_top_srcdir)/test/data/hello-world.odp
-	gdb --tui --args \
+	$(RUN_GDB) \
 		./loolwsd --o:security.capabilities="false" \
 			  --o:sys_template_path="@SYSTEMPLATE_PATH@" \
 			  --o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \


More information about the Libreoffice-commits mailing list