summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaxim <maxim@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2008-04-01 08:14:22 +0000
committermaxim <maxim@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2008-04-01 08:14:22 +0000
commitb3f36e492255400533794538574910135da10b92 (patch)
tree7a992e2b83ca9e1f6a4b626e92adec09854a3a9f
parentca1bbff0ee443807a36d8c7bf798672589ac37f6 (diff)
downloadeglibc2-b3f36e492255400533794538574910135da10b92.tar.gz
* Makerules (install-lib): Don't install libpthread_pic.a.
(install-map): Don't install libpthread_pic.map. git-svn-id: svn://svn.eglibc.org/trunk@5747 7b3dc134-2b1b-0410-93df-9e9f96275f8d
-rw-r--r--libc/ChangeLog.eglibc5
-rw-r--r--libc/Makerules3
2 files changed, 8 insertions, 0 deletions
diff --git a/libc/ChangeLog.eglibc b/libc/ChangeLog.eglibc
index a6b6faa1f..7bae20c7b 100644
--- a/libc/ChangeLog.eglibc
+++ b/libc/ChangeLog.eglibc
@@ -1,3 +1,8 @@
+2008-04-01 Maxim Kuvyrkov <maxim@codesourcery.com>
+
+ * Makerules (install-lib): Don't install libpthread_pic.a.
+ (install-map): Don't install libpthread_pic.map.
+
2008-02-23 Daniel Jacobowitz <dan@codesourcery.com>
PR nptl/3270
diff --git a/libc/Makerules b/libc/Makerules
index a71234e95..dced7e8d8 100644
--- a/libc/Makerules
+++ b/libc/Makerules
@@ -908,10 +908,13 @@ install-lib.so-unversioned := $(filter-out $(versioned), $(install-lib.so))
# Install the _pic.a files for versioned libraries, and corresponding
# .map files.
+# libpthread_pic.a breaks mklibs, so don't install it and its map.
install-lib := $(install-lib) $(install-lib.so-versioned:%.so=%_pic.a)
+install-lib := $(filter-out libpthread_pic.a,$(install-lib))
ifeq ($(versioning),yes)
install-map := $(patsubst %.so,%.map,\
$(foreach L,$(install-lib.so-versioned),$(notdir $L)))
+install-map := $(filter-out libpthread.map,$(install-map))
ifndef subdir
install-map := $(install-map) libc.map
endif