summaryrefslogtreecommitdiffstats
path: root/rules/host-qemu.make
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2016-04-30 15:44:36 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2016-05-01 09:12:26 +0200
commit240a6fa76541bd9f3c52ec4499c8ad4af6e0110d (patch)
treee7aabb7f1a9952bcbbcdacc9dad04d6476d0ef50 /rules/host-qemu.make
parent7286096f1c6d1fb64ebcf4e7e95ca457fac09fc7 (diff)
downloadptxdist-240a6fa76541bd9f3c52ec4499c8ad4af6e0110d.tar.gz
ptxdist-240a6fa76541bd9f3c52ec4499c8ad4af6e0110d.tar.xz
gobject-introspection: don't use rpath
It's only used for running in qemu and although the rpath is disabled, the path remains in the target binary. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/host-qemu.make')
-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 a4a54b611..f66cd6521 100644
--- a/rules/host-qemu.make
+++ b/rules/host-qemu.make
@@ -123,12 +123,13 @@ HOST_QEMU_CONF_OPT := \
--with-system-pixman
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)
$(STATEDIR)/host-qemu.install.post:
@$(call targetinfo)
@$(call world/install.post, HOST_QEMU)
ifdef PTXCONF_HOST_QEMU_USR
- @echo -e '#!/bin/sh\nexec $(PTXDIST_SYSROOT_HOST)/bin/qemu-$(HOST_QEMU_TARGETS) -L $(PTXDIST_SYSROOT_TOOLCHAIN) -E LD_LIBRARY_PATH=$(PTXDIST_SYSROOT_TOOLCHAIN)/lib:$(SYSROOT)/$(CROSS_LIB_DIR):$(SYSROOT)/usr/$(CROSS_LIB_DIR) "$${@}"' > $(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross
+ @echo -e '#!/bin/sh\nexec $(PTXDIST_SYSROOT_HOST)/bin/qemu-$(HOST_QEMU_TARGETS) -L $(PTXDIST_SYSROOT_TOOLCHAIN) -E LD_LIBRARY_PATH=$(QEMU_CROSS_LD_LIBRARY_PATH) "$${@}"' > $(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross
@chmod +x $(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross
@install -d -m 755 $(PTXDIST_SYSROOT_CROSS)/bin/qemu/
@sed \