From a839b4f0bb12095f2a3e46ad2c7b47034ebba2b6 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Thu, 8 Apr 2021 15:03:48 +0200 Subject: [PATCH] gdb_monitor: adapt to sandbox library changes Issue #4068 --- repos/ports/src/app/gdb_monitor/app_child.h | 2 +- repos/ports/src/app/gdb_monitor/target.mk | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/repos/ports/src/app/gdb_monitor/app_child.h b/repos/ports/src/app/gdb_monitor/app_child.h index e6ed24bcfc..fcdca656d7 100644 --- a/repos/ports/src/app/gdb_monitor/app_child.h +++ b/repos/ports/src/app/gdb_monitor/app_child.h @@ -346,7 +346,7 @@ class Gdb_monitor::App_child : public Child_policy, }); }); - _server.apply_config(Xml_node(server_config)); + _server.apply_updated_policy(); } catch(Xml_generator::Buffer_exceeded &) { error("XML buffer for server configuration exceeded"); diff --git a/repos/ports/src/app/gdb_monitor/target.mk b/repos/ports/src/app/gdb_monitor/target.mk index 198314d971..4f6c85aec7 100644 --- a/repos/ports/src/app/gdb_monitor/target.mk +++ b/repos/ports/src/app/gdb_monitor/target.mk @@ -107,8 +107,12 @@ INC_DIR += $(SANDBOX_PARENT_DIR) vpath sandbox/%.cc $(SANDBOX_PARENT_DIR) -# import selected headers needed from sandbox library -SANDBOX_HEADERS = types.h verbose.h report.h name_registry.h service.h utils.h +# +# Import headers needed from sandbox library, but exclude server.h because it +# collides with the GDB server's server.h +# +SANDBOX_HEADERS := $(notdir $(wildcard $(addsuffix /*.h,$(SANDBOX_SRC_DIR)))) +SANDBOX_HEADERS := $(filter-out server.h,$(SANDBOX_HEADERS)) genode-low.o sandbox/server.o: $(SANDBOX_HEADERS)