Commit 36ef1b44 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

toolchain-external: conditionalize the installation of libraries 



The external toolchain code makes the assumption that all C libraries
have a ld*.so, libc.so, libcrypt.so, libdl.so, libgcc_s.so, libm.so,
libnsl.so, libresolv.so, libutil.so, and when thread support is
enabled, libpthread.so, etc.

However, this is not the case with the musl C library, which
integrates all the functionalities in a single libc.so file. In
preparation of the support of the musl library, we make the current
value of LIB_EXTERNAL_LIBS conditional to glibc or uClibc.

The addition of additional libraries through
BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS is kept outside the condition, at
the end.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 9c5efee8

toolchain/toolchain-external/toolchain-external.mk

+11 −8
Original line number Diff line number Diff line
@@ -54,8 +54,16 @@ 
#  $(HOST_DIR)/usr/bin like for the internal toolchains, and the rest

#  of Buildroot is handled identical for the 2 toolchain types.



LIB_EXTERNAL_LIBS=ld*.so libc.so libcrypt.so libdl.so libgcc_s.so libm.so libnsl.so libresolv.so librt.so libutil.so

LIB_EXTERNAL_LIBS+=$(call qstrip,$(BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS))

ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)

LIB_EXTERNAL_LIBS+=ld*.so libc.so libcrypt.so libdl.so libgcc_s.so libm.so libnsl.so libresolv.so librt.so libutil.so

ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)

LIB_EXTERNAL_LIBS+=libpthread.so

ifneq ($(BR2_PACKAGE_GDB_SERVER)$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),)

LIB_EXTERNAL_LIBS+=libthread_db.so

endif # gdbserver

endif # ! no threads

endif



ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC),y)

LIB_EXTERNAL_LIBS+=libnss_files.so libnss_dns.so

endif
@@ -64,12 +72,7 @@ ifeq ($(BR2_INSTALL_LIBSTDCPP),y) 
USR_LIB_EXTERNAL_LIBS+=libstdc++.so

endif



ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)

LIB_EXTERNAL_LIBS+=libpthread.so

ifneq ($(BR2_PACKAGE_GDB_SERVER)$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),)

LIB_EXTERNAL_LIBS+=libthread_db.so

endif # gdbserver

endif # ! no threads

LIB_EXTERNAL_LIBS+=$(call qstrip,$(BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS))



# Details about sysroot directory selection.

#