diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-04-29 09:05:02 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-04-29 09:05:02 +0200 |
| commit | 96d084a12d2baaacf9003bf676b01bdbc5ac592b (patch) | |
| tree | 153cf10db96f44a837c402b3ae60078a3157cbe0 | |
| parent | 1f91d82da077c337c79d8f8f9321e461ffca476c (diff) | |
| download | ptxdist-96d084a12d2baaacf9003bf676b01bdbc5ac592b.tar.gz ptxdist-96d084a12d2baaacf9003bf676b01bdbc5ac592b.tar.xz | |
host-qemu: fix cross ldd for x86_64
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/host-qemu.make | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rules/host-qemu.make b/rules/host-qemu.make index 9a09d387e..a4a54b611 100644 --- a/rules/host-qemu.make +++ b/rules/host-qemu.make @@ -122,6 +122,8 @@ HOST_QEMU_CONF_OPT := \ \ --with-system-pixman +QEMU_CROSS_DL = $(shell ptxd_cross_cc_v |sed -n -e 's/.* -dynamic-linker \([^ ]*\).*/\1/p') + $(STATEDIR)/host-qemu.install.post: @$(call targetinfo) @$(call world/install.post, HOST_QEMU) @@ -130,9 +132,7 @@ ifdef PTXCONF_HOST_QEMU_USR @chmod +x $(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross @install -d -m 755 $(PTXDIST_SYSROOT_CROSS)/bin/qemu/ @sed \ - -e 's|RTLDLIST=/lib|RTLDLIST=$(PTXDIST_SYSROOT_TOOLCHAIN)/lib|'\ - -e 's|RTLDLIST="/lib|RTLDLIST="$(PTXDIST_SYSROOT_TOOLCHAIN)/lib|' \ - -e 's|RTLDLIST="\(.*\) /lib|RTLDLIST="\1 $(PTXDIST_SYSROOT_TOOLCHAIN)/lib|' \ + -e 's|RTLDLIST=.*|RTLDLIST="$(PTXDIST_SYSROOT_TOOLCHAIN)$(QEMU_CROSS_DL)"|' \ -e 's|eval $$add_env|eval $(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross -E "$${add_env// /,}"|' \ -e 's|verify_out=`|verify_out=`$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross |' \ -e 's|#! */.*$$|#!$(shell readlink $(PTXDIST_TOPDIR)/bin/bash)|' \ |