diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-10-08 20:17:06 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2013-10-09 15:15:06 +0200 |
| commit | 186a99b1c6562da724a5500190835c709d152df4 (patch) | |
| tree | 823fec48f97e7da2b539a8f3491ac95f20a0fd90 /toolchain/helpers.mk | |
| parent | 36ef1b4494f669d9c6f8507fb912f83f46a2d63d (diff) | |
toolchain: modify the wildcard logic for shared libraries copying
Until now, the copy_toolchain_lib_root function took as argument the
base name of a library (e.g: libm.so), and was assuming that the usual
scheme libm.so.<x> being a symbolic link to the real library was used.
However, with musl based toolchains, the C library is named libc.so
directly, with no symbolic link at all. Therefore, this commit changes
the copy_toolchain_lib_root to move the responsibility of using a
wildcard or not after the library name the caller's responsibility.
So, all the existing LIB_EXTERNAL_LIBS values are modified to have a
.* at the end, so that the behavior is effectively unchanged.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'toolchain/helpers.mk')
| -rw-r--r-- | toolchain/helpers.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 27b67100f..37f2cf9b4 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -54,7 +54,7 @@ copy_toolchain_lib_root = \ $${ARCH_SYSROOT_DIR}/$${ARCH_LIB_DIR} \ $${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} \ $${SUPPORT_LIB_DIR} ; do \ - LIBSPATH=`find $${dir} -maxdepth 1 -name "$${LIB}.*" 2>/dev/null` ; \ + LIBSPATH=`find $${dir} -maxdepth 1 -name "$${LIB}" 2>/dev/null` ; \ if test -n "$${LIBSPATH}" ; then \ break ; \ fi \ |