toolchain/external: only copt the pthread lib if needed
PATCH 1/2 toolchain/external: only copt the pthread lib if needed
From: Yann E. MORIN <[email protected]>
If threads are disabled, do not try to copy the libpthread.so from the external library.
It is still expected that the BR configuration matches the external toolchain setup, and no check is done to enforce that.
--- toolchain/external-toolchain/ext-tool.mk | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
toolchain/external-toolchain/ext-tool.mk +5 -1
@@ -251,7 +251,7 @@ check_cross_compiler_exists = \ uclibc: dependencies $(STAMP_DIR)/ext-toolchain-installed -EXTERNAL_LIBS=libc.so libcrypt.so libdl.so libgcc_s.so libm.so libnsl.so libpthread.so libresolv.so librt.so libutil.so +EXTERNAL_LIBS=libc.so libcrypt.so libdl.so libgcc_s.so libm.so libnsl.so libresolv.so librt.so libutil.so ifeq ($(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) EXTERNAL_LIBS+=ld-uClibc.so else
@@ -262,6 +262,10 @@ ifeq ($(BR2_INSTALL_LIBSTDCPP),y) EXTERNAL_LIBS+=libstdc++.so endif +ifneq ($(BR2_PTHREADS_NONE),y) +EXTERNAL_LIBS+=libpthread.so +endif # ! no threads + # SYSROOT_DIR selection. We first try the -print-sysroot option, # available in gcc 4.4.x and in some Codesourcery toolchains. If this # option is not available, we fallback to the value of --with-sysroot
PATCH 2/2 external toolchain: also copy the libthread_db.so for gdbserver
From: Yann E. MORIN <[email protected]>
gdbserver dlopen(3)s libthread_db.so at runtime, so there is no dependency on it (does not appear as being (NEEDED)).
Copy libthread_db.so from external toolchain when gdbserver is enbled.
--- toolchain/external-toolchain/ext-tool.mk | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
toolchain/external-toolchain/ext-tool.mk +3 -0
@@ -264,6 +264,9 @@ endif ifneq ($(BR2_PTHREADS_NONE),y) EXTERNAL_LIBS+=libpthread.so +ifeq ($(BR2_PACKAGE_GDB_SERVER),y) +EXTERNAL_LIBS+=libthread_db.so +endif # gdbserver endif # ! no threads # SYSROOT_DIR selection. We first try the -print-sysroot option,
PATCH 1/2 toolchain/external: only copt the pthread lib if needed
In reply to Yann E. MORINQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
Yann> From: Yann E. MORIN <[email protected]> Yann> If threads are disabled, do not try to copy the libpthread.so from the Yann> external library.
Committed both, thanks!
Signature · 1 line
Bye, Peter Korsgaard