From ee615f365c80230ef52602b810df1b11dfa2d885 Mon Sep 17 00:00:00 2001 From: Mark Pryor Date: Tue, 6 Apr 2021 00:22:35 +0000 Subject: [PATCH] adapt for qemu-xen Signed-off-by: Mark Pryor --- tools/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/Makefile b/tools/Makefile index 39a4582..a6c1a59 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -235,7 +235,8 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find else \ virtfs='' ; \ fi ; \ - PKG_CONFIG_PATH=$(XEN_ROOT)/tools/pkg-config$${PKG_CONFIG_PATH:+:$${PKG_CONFIG_PATH}} \ + LDFLAGS="-L$(XEN_ROOT)/dist/install/usr/lib64/ -Wl,-rpath-link=$(XEN_ROOT)/dist/install/usr/lib64/ $$LDFLAGS" \ + PKG_CONFIG_PATH=$(XEN_ROOT)/dist/install/usr/lib64/pkgconfig$${PKG_CONFIG_PATH:+:$${PKG_CONFIG_PATH}} \ $$source/configure --enable-xen --target-list=i386-softmmu \ $(QEMU_XEN_ENABLE_DEBUG) \ $$enable_trace_backend \ @@ -244,10 +245,11 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find --includedir=$(LIBEXEC_INC) \ --extra-cflags="-DXC_WANT_COMPAT_EVTCHN_API=1 \ -DXC_WANT_COMPAT_GNTTAB_API=1 \ + -I$(XEN_ROOT)/tools/include \ -DXC_WANT_COMPAT_MAP_FOREIGN_API=1 \ -DXC_WANT_COMPAT_DEVICEMODEL_API=1 \ $(EXTRA_CFLAGS_QEMU_XEN)" \ - --extra-ldflags="$(QEMU_UPSTREAM_RPATH)" \ + --extra-ldflags=" -L$(XEN_ROOT)/dist/install/usr/lib64 -Wl,-rpath-link=$(XEN_ROOT)/dist/install/usr/lib64 " \ --bindir=$(LIBEXEC_BIN) \ --datadir=$(SHAREDIR)/qemu-xen \ --localstatedir=$(localstatedir) \ -- 2.27.0