diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2004-12-03 10:17:07 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2004-12-03 10:17:07 +0000 |
| commit | 2a561bf1e19f064e2f5689e961ea1f8e51bc14a0 (patch) | |
| tree | 91e08d15ba52846a86a5b0d7a12dcb984c28ccd9 /extra-lib.mk | |
| parent | aa8a3b59b1603ce0855e5130cb060318c8e8c78d (diff) | |
| download | glibc-2a561bf1e19f064e2f5689e961ea1f8e51bc14a0.tar.gz | |
Updated to fedora-glibc-20041203T0935
Diffstat (limited to 'extra-lib.mk')
| -rw-r--r-- | extra-lib.mk | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/extra-lib.mk b/extra-lib.mk index 5428523e06..775eb23cdd 100644 --- a/extra-lib.mk +++ b/extra-lib.mk @@ -11,6 +11,12 @@ extra-libs-left := $(filter-out $(lib),$(extra-libs-left)) object-suffixes-$(lib) := $(filter-out $($(lib)-inhibit-o),$(object-suffixes)) +ifneq (,$($(lib)-static-only-routines)) +ifneq (,$(filter yesyes%,$(build-shared)$(elf)$($(lib).so-version))) +object-suffixes-$(lib) += $(filter-out $($(lib)-inhibit-o),.oS) +endif +endif + ifneq (,$(object-suffixes-$(lib))) # Make sure these are simply-expanded variables before we append to them, @@ -23,7 +29,7 @@ all-$(lib)-routines := $($(lib)-routines) $($(lib)-sysdep_routines) # 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):.os=),\ +extra-objs += $(foreach o,$(filter-out .os .oS,$(object-suffixes-$(lib))),\ $(patsubst %,%$o,$(filter-out \ $($(lib)-shared-only-routines),\ $(all-$(lib)-routines)))) @@ -51,7 +57,7 @@ endif # Use o-iterator.mk to generate a rule for each flavor of library. -ifneq (,$(filter-out .os,$(object-suffixes-$(lib)))) +ifneq (,$(filter-out .os .oS,$(object-suffixes-$(lib)))) define o-iterator-doit $(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \ $(patsubst %,$(objpfx)%$o,\ @@ -59,13 +65,23 @@ $(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \ $(all-$(lib)-routines))); \ $$(build-extra-lib) endef -object-suffixes-left = $(object-suffixes-$(lib):.os=) -include $(patsubst %,$(..)o-iterator.mk,$(object-suffixes-$(lib):.os=)) +object-suffixes-left = $(filter-out .os .oS,$(object-suffixes-$(lib))) +include $(patsubst %,$(..)o-iterator.mk,$(object-suffixes-left)) endif ifneq (,$(filter .os,$(object-suffixes-$(lib)))) $(objpfx)$(patsubst %,$(libtype.os),$(lib:lib%=%)): \ - $(all-$(lib)-routines:%=$(objpfx)%.os) + $(patsubst %,$(objpfx)%.os,\ + $(filter-out $($(lib)-static-only-routines),\ + $(all-$(lib)-routines))) + $(build-extra-lib) +endif + +ifneq (,$(filter .oS,$(object-suffixes-$(lib)))) +$(objpfx)$(patsubst %,$(libtype.oS),$(lib:lib%=%)): \ + $(patsubst %,$(objpfx)%.oS,\ + $(filter $($(lib)-static-only-routines),\ + $(all-$(lib)-routines))) $(build-extra-lib) endif |