gdb_monitor: adapt to sandbox library changes

Issue #4068
This commit is contained in:
Norman Feske 2021-04-08 15:03:48 +02:00
parent 468e7a825c
commit a839b4f0bb
2 changed files with 7 additions and 3 deletions

View File

@ -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");

View File

@ -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)