summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-10-08 05:43:09 +0200
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-10-08 18:02:03 +0200
commit9b1077dc70e52ee85a718bce3fcfec7ae9af2967 (patch)
tree1ac212098aeaefd6b8403ba1a99de284fab9ff18
parent17ad14e5780533db90171e16b95dbeda4e81ffb0 (diff)
cleanup libc.a
The nested libpthread_nonshared.a and libdl.os shouldn't be included in the static libc.a. Fixes compile issues for static builds.
-rw-r--r--libc/Makefile.in1
-rw-r--r--libpthread/nptl/Makefile.in2
2 files changed, 0 insertions, 3 deletions
diff --git a/libc/Makefile.in b/libc/Makefile.in
index 55fd3d3ed..85986a7e9 100644
--- a/libc/Makefile.in
+++ b/libc/Makefile.in
@@ -44,7 +44,6 @@ endif
libc-a-y += $(libnsl-a-y)
libc-a-y += $(libresolv-a-y)
-libc-a-$(HAVE_SHARED) += $(libdl-a-y)
libc-a-y += $(libm-a-y)
libc-a-$(UCLIBC_HAS_LIBUTIL) += $(libutil-a-y)
libc-a-$(UCLIBC_HAS_CRYPT) += $(libcrypt-a-y)
diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in
index 0fc83e20e..068eee444 100644
--- a/libpthread/nptl/Makefile.in
+++ b/libpthread/nptl/Makefile.in
@@ -41,8 +41,6 @@ else
libpthread-a-y := $(libpthread-static-y)
endif
-libpthread-a-y += $(top_builddir)lib/libpthread_nonshared.a
-
libc-shared-routines-y := $(filter-out $(notdir $(libpthread_libc_OBJS:.o=.c)), $(libc-shared-routines-y))
libc-static-routines-y := $(filter-out $(notdir $(libpthread_libc_OBJS:.o=.c)), $(libc-static-routines-y))
libc-shared-routines-y := $(addprefix $(libpthread_OUT)/,$(libc-shared-routines-y:.c=.oS))