mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
xentoolcore: Link into stubdoms
We need to do this before we start to make the other libraries call into xentoolcore, or we break the stubdom build. Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> Acked-by: Wei Liu <wei.liu2@citrix.com>
This commit is contained in:
Ian Jackson authored and Ian Jackson committed
1 parent
b08da5859b
commit
c583d1f6a2
1 file changed
+15
-2
+15
-2
@@ -327,6 +327,9 @@ define do_links
|
||||
touch $@
|
||||
endef
|
||||
|
||||
libs-$(XEN_TARGET_ARCH)/toolcore/stamp: $(XEN_ROOT)/tools/libs/toolcore/Makefile
|
||||
$(do_links)
|
||||
|
||||
libs-$(XEN_TARGET_ARCH)/toollog/stamp: $(XEN_ROOT)/tools/libs/toollog/Makefile
|
||||
$(do_links)
|
||||
|
||||
@@ -351,7 +354,7 @@ libxc-$(XEN_TARGET_ARCH)/stamp: $(XEN_ROOT)/tools/libxc/Makefile
|
||||
xenstore/stamp: $(XEN_ROOT)/tools/xenstore/Makefile
|
||||
$(do_links)
|
||||
|
||||
LINK_LIBS_DIRS := toollog evtchn gnttab call foreignmemory devicemodel
|
||||
LINK_LIBS_DIRS := toolcore toollog evtchn gnttab call foreignmemory devicemodel
|
||||
LINK_DIRS := libxc-$(XEN_TARGET_ARCH) xenstore $(foreach dir,$(LINK_LIBS_DIRS),libs-$(XEN_TARGET_ARCH)/$(dir))
|
||||
LINK_STAMPS := $(foreach dir,$(LINK_DIRS),$(dir)/stamp)
|
||||
|
||||
@@ -375,6 +378,15 @@ $(TARGETS_MINIOS): mini-os-%:
|
||||
mkdir -p $@/$$i ; \
|
||||
done
|
||||
|
||||
#######
|
||||
# libxentoolcore
|
||||
#######
|
||||
|
||||
.PHONY: libxentoolcore
|
||||
libxentoolcore: libs-$(XEN_TARGET_ARCH)/toolcore/libxentoolcore.a
|
||||
libs-$(XEN_TARGET_ARCH)/toolcore/libxentoolcore.a: mk-headers-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE)
|
||||
CPPFLAGS="$(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/toolcore
|
||||
|
||||
#######
|
||||
# libxentoollog
|
||||
#######
|
||||
@@ -435,7 +447,7 @@ libs-$(XEN_TARGET_ARCH)/devicemodel/libxendevicemodel.a: mk-headers-$(XEN_TARGET
|
||||
|
||||
.PHONY: libxc
|
||||
libxc: libxc-$(XEN_TARGET_ARCH)/libxenctrl.a libxc-$(XEN_TARGET_ARCH)/libxenguest.a
|
||||
libxc-$(XEN_TARGET_ARCH)/libxenctrl.a: mk-headers-$(XEN_TARGET_ARCH) libxentoollog libxenevtchn libxengnttab libxencall libxenforeignmemory libxendevicemodel cross-zlib
|
||||
libxc-$(XEN_TARGET_ARCH)/libxenctrl.a: mk-headers-$(XEN_TARGET_ARCH) libxentoolcore libxentoollog libxenevtchn libxengnttab libxencall libxenforeignmemory libxendevicemodel cross-zlib
|
||||
CPPFLAGS="$(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) DESTDIR= CONFIG_LIBXC_MINIOS=y -C libxc-$(XEN_TARGET_ARCH)
|
||||
|
||||
libxc-$(XEN_TARGET_ARCH)/libxenguest.a: libxc-$(XEN_TARGET_ARCH)/libxenctrl.a
|
||||
@@ -659,6 +671,7 @@ clean:
|
||||
rm -f $(STUBDOMPATH)
|
||||
rm -f *-minios-config.mk
|
||||
rm -fr pkg-config
|
||||
[ ! -e libs-$(XEN_TARGET_ARCH)/toolcore/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/toolcore clean
|
||||
[ ! -e libs-$(XEN_TARGET_ARCH)/toollog/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/toollog clean
|
||||
[ ! -e libs-$(XEN_TARGET_ARCH)/evtchn/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/evtchn clean
|
||||
[ ! -e libs-$(XEN_TARGET_ARCH)/gnttab/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/gnttab clean
|
||||
|
||||