1 From 9b1077dc70e52ee85a718bce3fcfec7ae9af2967 Mon Sep 17 00:00:00 2001
2 From: Waldemar Brodkorb <wbx@uclibc-ng.org>
3 Date: Sat, 8 Oct 2016 05:43:09 +0200
4 Subject: [PATCH] cleanup libc.a
6 The nested libpthread_nonshared.a and libdl.os shouldn't be included
7 in the static libc.a. Fixes compile issues for static builds.
9 Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
11 libc/Makefile.in | 1 -
12 libpthread/nptl/Makefile.in | 2 --
13 2 files changed, 3 deletions(-)
15 diff --git a/libc/Makefile.in b/libc/Makefile.in
16 index 55fd3d3..85986a7 100644
17 --- a/libc/Makefile.in
18 +++ b/libc/Makefile.in
19 @@ -44,7 +44,6 @@ endif
21 libc-a-y += $(libnsl-a-y)
22 libc-a-y += $(libresolv-a-y)
23 -libc-a-$(HAVE_SHARED) += $(libdl-a-y)
24 libc-a-y += $(libm-a-y)
25 libc-a-$(UCLIBC_HAS_LIBUTIL) += $(libutil-a-y)
26 libc-a-$(UCLIBC_HAS_CRYPT) += $(libcrypt-a-y)
27 diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in
28 index 0fc83e2..068eee4 100644
29 --- a/libpthread/nptl/Makefile.in
30 +++ b/libpthread/nptl/Makefile.in
31 @@ -41,8 +41,6 @@ else
32 libpthread-a-y := $(libpthread-static-y)
35 -libpthread-a-y += $(top_builddir)lib/libpthread_nonshared.a
37 libc-shared-routines-y := $(filter-out $(notdir $(libpthread_libc_OBJS:.o=.c)), $(libc-shared-routines-y))
38 libc-static-routines-y := $(filter-out $(notdir $(libpthread_libc_OBJS:.o=.c)), $(libc-static-routines-y))
39 libc-shared-routines-y := $(addprefix $(libpthread_OUT)/,$(libc-shared-routines-y:.c=.oS))