It is assumed by the makefiles that all dynamic linkers must be put in
/lib. This is however not true. Especially on multilib configurations this
information cannot be guessed. By looking in the sysroot of the compiler
toolchain the right paths can be found. Default the scripts already look
there, so remove the unneeded options.
Signed-off-by: Remy Bohmer <li...@bohmer.net>
---
v2: repost to keep the series together
rules/glibc.make | 2 +-
rules/post/install.make | 9 +++------
rules/uclibc.make | 2 +-
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/rules/glibc.make b/rules/glibc.make
index c4e6724..3ddf249 100644
--- a/rules/glibc.make
+++ b/rules/glibc.make
@@ -36,7 +36,7 @@ $(STATEDIR)/glibc.targetinstall:
@$(call install_fixup, glibc,DESCRIPTION,missing)
ifdef PTXCONF_GLIBC_LD
- @$(call install_copy_toolchain_dl, glibc, /lib)
+ @$(call install_copy_toolchain_dl, glibc)
endif
ifdef PTXCONF_GLIBC_C
diff --git a/rules/post/install.make b/rules/post/install.make
index 4ad7f87..190ec28 100644
--- a/rules/post/install.make
+++ b/rules/post/install.make
@@ -317,17 +317,14 @@ install_copy_toolchain_lib =
\
# install_copy_toolchain_dl
#
# $1: xpkg label
-# $2: destination
-# $3: strip (y|n) default is to strip
+# $2: strip (y|n) default is to strip
#
install_copy_toolchain_dl =
\
XPKG=$(subst _,-,$(strip $(1)));
\
- DST="$(strip $2)";
\
- STRIP="$(strip $3)";
\
- test "$${DST}" != "" && DST="-d $${DST}";
\
+ STRIP="$(strip $2)";
\
$(call install_check, install_copy_toolchain_dl);
\
${CROSS_ENV_CC} $(CROSS_ENV_STRIP) PKGDIR="$(PKGDIR)"
\
- $(SCRIPTSDIR)/install_copy_toolchain.sh -p "$${XPKG}" -l LINKER
$${DST} -s "$${STRIP}"
+ $(SCRIPTSDIR)/install_copy_toolchain.sh -p "$${XPKG}" -l LINKER
-s "$${STRIP}"
#
# install_copy_toolchain_other
diff --git a/rules/uclibc.make b/rules/uclibc.make
index 22583fd..c6cc86f 100644
--- a/rules/uclibc.make
+++ b/rules/uclibc.make
@@ -30,7 +30,7 @@ $(STATEDIR)/uclibc.targetinstall:
@$(call install_fixup, uclibc,DESCRIPTION,missing)
ifdef PTXCONF_UCLIBC
- @$(call install_copy_toolchain_dl, uclibc, /lib)
+ @$(call install_copy_toolchain_dl, uclibc)
endif
ifdef PTXCONF_UCLIBC_C
--
1.7.5.4
--
ptxdist mailing list
ptxdist@pengutronix.de
