Skip to contentSkip to conversation

tools: fix linking hypervisor includes to tools include directory

PATCH In review Juergen Gross 2 participants 3 messages Sep 11, 2019 – Sep 20, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools: fix linking hypervisor includes to tools include directory

An incremental build of tools/include won't pickup new hypervisor headers in tools/include/xen. Fix that.

---
 tools/include/Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
tools/include/Makefile +6 -3
index 71538e1ce2..3d0192fbad 100644
@@ -12,11 +12,14 @@ all-y:
 xen-foreign:
 	$(MAKE) -C xen-foreign
 
-xen/.dir:
+XEN_PUBLIC_INCLUDES = $(wildcard $(XEN_ROOT)/xen/include/public/*.h)
+XEN_LIB_X86_INCLUDES = $(filter-out %autogen.h, $(XEN_ROOT)/xen/include/xen/lib/x86/Makefile $(wildcard $(XEN_ROOT)/xen/include/xen/lib/x86/*.h))
+
+xen/.dir: $(XEN_PUBLIC_INCLUDES) $(XEN_LIB_X86_INCLUDES)
 	@rm -rf xen
 	mkdir -p xen/libelf
 	ln -sf $(XEN_ROOT)/xen/include/public/COPYING xen
-	ln -sf $(wildcard $(XEN_ROOT)/xen/include/public/*.h) xen
+	ln -sf $(XEN_PUBLIC_INCLUDES) xen
 	ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-x86 arch-arm hvm io xsm) xen
 	ln -sf ../xen-sys/$(XEN_OS) xen/sys
 	ln -sf $(addprefix $(XEN_ROOT)/xen/include/xen/,libelf.h elfstructs.h) xen/libelf/
@@ -25,7 +28,7 @@ xen/.dir:
 ifeq ($(CONFIG_X86),y)
 	ln -sf $(XEN_ROOT)/xen/include/asm-x86 xen/asm
 	mkdir -p xen/lib/x86
-	for f in $(filter-out %autogen.h,$(patsubst $(XEN_ROOT)/xen/include/xen/lib/x86/%,%,Makefile $(wildcard $(XEN_ROOT)/xen/include/xen/lib/x86/*.h))); do \
+	for f in $(patsubst $(XEN_ROOT)/xen/include/xen/lib/x86/%,%,$(XEN_LIB_X86_INCLUDES)); do \
 		ln -sf $(XEN_ROOT)/xen/include/xen/lib/x86/$$f xen/lib/x86/$$f; \
 	done
 endif
Signature · 7 lines
2.16.4


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Acked-by on v1 1/1
#1 lore raw

Juergen Gross writes ("[PATCH] tools: fix linking hypervisor includes to tools include directory"):

Quoted 2 lines

An incremental build of tools/include won't pickup new hypervisor headers in tools/include/xen. Fix that.

I personally I think trying to get this kind of thing to work properly with recursive make is too hard to be worth trying. But I won't stand in your way.

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

#2 lore raw

Ian Jackson writes ("Re: [PATCH] tools: fix linking hypervisor includes to tools include directory"):

Quoted 9 lines

Juergen Gross writes ("[PATCH] tools: fix linking hypervisor includes to tools include directory"):

Quoted 2 lines

An incremental build of tools/include won't pickup new hypervisor headers in tools/include/xen. Fix that.

I personally I think trying to get this kind of thing to work properly with recursive make is too hard to be worth trying. But I won't stand in your way.

And committed.

Ian.

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel