summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2018-04-18 07:56:12 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2018-04-18 08:53:53 +0200
commitfd5aed9c339bba9fe7767652b2ab3d0da314fc27 (patch)
treebad3c8cc002ad04f53f2b62d3066e1662c19f636
parent0caa472b76e27a1006a79413f6555561e2e6877e (diff)
downloadptxdist-fd5aed9c339bba9fe7767652b2ab3d0da314fc27.tar.gz
ptxdist-fd5aed9c339bba9fe7767652b2ab3d0da314fc27.tar.xz
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 <m.olbrich@pengutronix.de>
-rw-r--r--rules/host-qemu.make3
1 files changed, 2 insertions, 1 deletions
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)" \