From fd5aed9c339bba9fe7767652b2ab3d0da314fc27 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Wed, 18 Apr 2018 07:56:12 +0200 Subject: host-qemu: make sure libatomic is found by qemu-user Needed for pango gobject-introspection for ARMv5 and maybe others. Signed-off-by: Michael Olbrich --- rules/host-qemu.make | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/host-qemu.make b/rules/host-qemu.make index 8f5a2de9f..abbc5ad5b 100644 --- a/rules/host-qemu.make +++ b/rules/host-qemu.make @@ -146,7 +146,8 @@ HOST_QEMU_CONF_OPT := \ # Use '=' to delay $(shell ...) calls until this is needed QEMU_CROSS_QEMU = $(shell ptxd_get_alternative config/qemu qemu-cross && echo $$ptxd_reply) QEMU_CROSS_DL = $(shell ptxd_cross_cc_v | sed -n -e 's/.* -dynamic-linker \([^ ]*\).*/\1/p') -QEMU_CROSS_LD_LIBRARY_PATH := $(PTXDIST_SYSROOT_TOOLCHAIN)/lib:$(SYSROOT)/$(CROSS_LIB_DIR):$(SYSROOT)/usr/$(CROSS_LIB_DIR) +QEMU_CROSS_TOOLEXECLIBDIR = $(shell dirname $$(realpath $$(ptxd_cross_cc -print-file-name=libatomic.so 2> /dev/null))) +QEMU_CROSS_LD_LIBRARY_PATH = $(PTXDIST_SYSROOT_TOOLCHAIN)/lib:$(QEMU_CROSS_TOOLEXECLIBDIR):$(SYSROOT)/$(CROSS_LIB_DIR):$(SYSROOT)/usr/$(CROSS_LIB_DIR) QEMU_CROSS_QEMU_ENV = \ QEMU="$(PTXDIST_SYSROOT_HOST)/bin/qemu-$(HOST_QEMU_TARGETS)" \ -- cgit v1.2.3