Message ID | 1389687696-4824-2-git-send-email-stefan.sorensen@spectralink.com |
---|---|
State | Accepted |
Commit | 803a105f90c939464cbabf8ee91f0d63e5f70f68 |
Headers | show |
>>>>> "Stefan" == Stefan Sørensen <stefan.sorensen@spectralink.com> writes: > Currently ld-linux-armhf.so.* is added to external libs when > using an EABIhf toolchain, but this naming is not used by uClibc. > Fix by adding a check for glibc. > Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com> > --- Committed, thanks.
diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 1084ee2..a7bfafc 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -63,7 +63,7 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) LIB_EXTERNAL_LIBS+=libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.* -ifeq ($(BR2_ARM_EABIHF),y) +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_ARM_EABIHF),yy) LIB_EXTERNAL_LIBS+=ld-linux-armhf.so.* else LIB_EXTERNAL_LIBS+=ld*.so.*
Currently ld-linux-armhf.so.* is added to external libs when using an EABIhf toolchain, but this naming is not used by uClibc. Fix by adding a check for glibc. Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com> --- toolchain/toolchain-external/toolchain-external.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)