X-Git-Url: http://git.csclub.uwaterloo.ca/?p=kopensolaris-gnu%2Fglibc.git;a=blobdiff_plain;f=extra-lib.mk;h=0b79d4a4597b1fef201b4a28be2da8e0fd510092;hp=f6a1c83e37b14a76afbbb18c3037b8afbc8f605a;hb=fcb39030cc930bbbcaaa302612b782ade4a49000;hpb=0635a1866e8b98b6020c3ec3fc83628d306c10eb;ds=sidebyside

diff --git a/extra-lib.mk b/extra-lib.mk
index f6a1c83e37..0b79d4a459 100644
--- a/extra-lib.mk
+++ b/extra-lib.mk
@@ -10,6 +10,8 @@ extra-libs-left := $(filter-out $(lib),$(extra-libs-left))
 
 object-suffixes-$(lib) := $(filter-out $($(lib)-inhibit-o),$(object-suffixes))
 
+ifneq (,$(object-suffixes-$(lib)))
+
 # Make sure these are simply-expanded variables before we append to them,
 # since we want the expressions we append to be expanded right now.
 install-lib := $(install-lib)
@@ -17,24 +19,37 @@ extra-objs := $(extra-objs)
 
 # Add each flavor of library to the lists of things to build and install.
 install-lib += $(foreach o,$(object-suffixes-$(lib)),$(lib:lib%=$(libtype$o)))
-extra-objs += $(foreach o,$(object-suffixes-$(lib)),$($(lib)-routines:=$o))
+extra-objs += $(foreach o,$(object-suffixes-$(lib)),\
+			$(patsubst %,%$o,$($(lib)-routines)))
 alltypes-$(lib) := $(foreach o,$(object-suffixes-$(lib)),\
-			     $(common-objpfx)$(patsubst %,$(libtype$o),\
+			     $(objpfx)$(patsubst %,$(libtype$o),\
 			     $(lib:lib%=%)))
-ifneq (,$(filter .so,$(object-suffixes-$(lib))))
-alltypes-$(lib) += $(common-objpfx)$(lib).so
-endif
 
-ifeq (,$($(lib)-no-lib-dep))
+ifeq (,$(filter $(lib),$(extra-libs-others)))
 lib-noranlib: $(alltypes-$(lib))
+ifeq (yes,$(build-shared))
+lib-noranlib: $(objpfx)$(lib).so$($(lib).so-version)
+endif
 else
 others: $(alltypes-$(lib))
 endif
 
+# The linked shared library is never a dependent of lib-noranlib,
+# because linking it will depend on libc.so already being built.
+ifneq (,$(filter .os,$(object-suffixes-$(lib))))
+others: $(objpfx)$(lib).so$($(lib).so-version)
+endif
+
+
 # Use o-iterator.mk to generate a rule for each flavor of library.
 define o-iterator-doit
-$(common-objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \
+$(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \
   $($(lib)-routines:%=$(objpfx)%$o); $$(build-extra-lib)
 endef
 object-suffixes-left = $(object-suffixes-$(lib))
 include $(patsubst %,$(..)o-iterator.mk,$(object-suffixes-$(lib)))
+
+# Add the version script to the dependencies of the shared library.
+$(objpfx)$(lib).so: $(firstword $(wildcard $($(lib)-map) $(lib).map $(..)$(lib).map))
+
+endif