From 765c2035a765c426c130c1f2cc009af60a99b1bd Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 16 Oct 2017 11:05:11 +0100 Subject: [PATCH] toolcore: Build in rumprun environment too Otherwise, f942a9b4a12081d5f9a4679d06e88cb5d503396e xentoolcore_restrict_all: "Implement" for xenstore breaks the build of the tools inside rumprun. toolcore is in libs, so we need to add the CONFIG_RUMP special case to tools/libs/Makefile and add toolcore there. Signed-off-by: Ian Jackson Acked-by: Wei Liu --- tools/Makefile | 2 +- tools/libs/Makefile | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/Makefile b/tools/Makefile index 03d326a02c..84d6e3b4e4 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -49,7 +49,7 @@ SUBDIRS-$(OCAML_TOOLS) += ocaml endif ifeq ($(CONFIG_RUMP),y) -SUBDIRS-y := libxc xenstore +SUBDIRS-y := libs libxc xenstore endif # For the sake of linking, set the sys-root diff --git a/tools/libs/Makefile b/tools/libs/Makefile index ea9a64d557..88901e7341 100644 --- a/tools/libs/Makefile +++ b/tools/libs/Makefile @@ -10,4 +10,8 @@ SUBDIRS-y += call SUBDIRS-y += foreignmemory SUBDIRS-y += devicemodel +ifeq ($(CONFIG_RUMP),y) +SUBDIRS-y := toolcore +endif + all clean install distclean uninstall: %: subdirs-% -- 2.30.2