43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
|
From 9b1077dc70e52ee85a718bce3fcfec7ae9af2967 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
|
||
|
|
Date: Sat, 8 Oct 2016 05:43:09 +0200
|
||
|
|
Subject: [PATCH] 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.
|
||
|
|
|
||
|
|
Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
|
||
|
|
---
|
||
|
|
libc/Makefile.in | 1 -
|
||
|
|
libpthread/nptl/Makefile.in | 2 --
|
||
|
|
2 files changed, 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/libc/Makefile.in b/libc/Makefile.in
|
||
|
|
index 55fd3d3..85986a7 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 0fc83e2..068eee4 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))
|
||
|
|
--
|
||
|
|
2.1.4
|
||
|
|
|