From: Konrad Rzeszutek Wilk Date: Fri, 8 Jan 2016 14:56:32 +0000 (-0500) Subject: Makefile: Deal with "tools: Refactor "xentoollog" into its own library" X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=35d6f656b282cad58556009438decb8a06f437c3;p=xentesttools%2Fbootstrap.git Makefile: Deal with "tools: Refactor "xentoollog" into its own library" In Xen 4.7 commit 5d3dc8671521ea4a4f753e77d3e7fb3a3a6f5f80 ("tools: Refactor "xentoollog" into its own library") puts an requirement on Python code to compile with: -Wl,-rpath-link="+PATH_LIBXENTOOLLOG" Which ends up with: error: -Wl,-rpath-link=../../tools/libs/toollog: No such file or directory We can't over-write the PATH_LIBXENTOOLLOG .. and on further thought - there is absolutly no need for us to even build Python code as we do not need Xend. As such if we detect Xen 4.7 or later we skip this part. Signed-off-by: Konrad Rzeszutek Wilk --- diff --git a/root_image/Makefile b/root_image/Makefile index de21cbe..12ce7b2 100644 --- a/root_image/Makefile +++ b/root_image/Makefile @@ -813,7 +813,9 @@ perl-core: .PHONY: xen-python-bytecode xen-python-bytecode: python-install - make -j$$(($(NCPUS) * 2)) -C ../xen/tools/python DESTDIR=$(CURDIR)/userspace install + if [ $(XEN_VERSION) -lt 7 ]; then \ + make -j$$(($(NCPUS) * 2)) -C ../xen/tools/python DESTDIR=$(CURDIR)/userspace install; \ + fi .PHONY: yajl-depend yajl-depend: