| Index: extra-lib.mk
|
| diff --git a/extra-lib.mk b/extra-lib.mk
|
| index 775eb23cdd36960d5e16e0589225324ddf2235fe..5e945323597893de95ab94fc0780388737e2ddca 100644
|
| --- a/extra-lib.mk
|
| +++ b/extra-lib.mk
|
| @@ -13,7 +13,7 @@ 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)
|
| +object-suffixes-$(lib) += $(filter-out $($(lib)-inhibit-o),.ons)
|
| endif
|
| endif
|
|
|
| @@ -29,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,$(filter-out .os .oS,$(object-suffixes-$(lib))),\
|
| +extra-objs += $(foreach o,$(filter-out .os .ons,$(object-suffixes-$(lib))),\
|
| $(patsubst %,%$o,$(filter-out \
|
| $($(lib)-shared-only-routines),\
|
| $(all-$(lib)-routines))))
|
| @@ -57,7 +57,7 @@ endif
|
|
|
|
|
| # Use o-iterator.mk to generate a rule for each flavor of library.
|
| -ifneq (,$(filter-out .os .oS,$(object-suffixes-$(lib))))
|
| +ifneq (,$(filter-out .os .ons,$(object-suffixes-$(lib))))
|
| define o-iterator-doit
|
| $(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \
|
| $(patsubst %,$(objpfx)%$o,\
|
| @@ -65,7 +65,7 @@ $(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \
|
| $(all-$(lib)-routines))); \
|
| $$(build-extra-lib)
|
| endef
|
| -object-suffixes-left = $(filter-out .os .oS,$(object-suffixes-$(lib)))
|
| +object-suffixes-left = $(filter-out .os .ons,$(object-suffixes-$(lib)))
|
| include $(patsubst %,$(..)o-iterator.mk,$(object-suffixes-left))
|
| endif
|
|
|
| @@ -77,9 +77,9 @@ $(objpfx)$(patsubst %,$(libtype.os),$(lib:lib%=%)): \
|
| $(build-extra-lib)
|
| endif
|
|
|
| -ifneq (,$(filter .oS,$(object-suffixes-$(lib))))
|
| -$(objpfx)$(patsubst %,$(libtype.oS),$(lib:lib%=%)): \
|
| - $(patsubst %,$(objpfx)%.oS,\
|
| +ifneq (,$(filter .ons,$(object-suffixes-$(lib))))
|
| +$(objpfx)$(patsubst %,$(libtype.ons),$(lib:lib%=%)): \
|
| + $(patsubst %,$(objpfx)%.ons,\
|
| $(filter $($(lib)-static-only-routines),\
|
| $(all-$(lib)-routines)))
|
| $(build-extra-lib)
|
|
|