Don't build .os objects of static-only-routines for extra libs

This commit is contained in:
Andreas Schwab 2013-03-11 15:47:03 +01:00
parent 05087fbb0d
commit 9dc7c64f93
2 changed files with 11 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2013-03-13 Andreas Schwab <schwab@suse.de>
* extra-lib.mk (extra-objs): Add static-only-routines as .oS
instead of .os.
2013-03-13 Joseph Myers <joseph@codesourcery.com>
* timezone/zic.c: Update from tzcode 2013b.

View File

@ -34,7 +34,12 @@ extra-objs += $(foreach o,$(filter-out .os .oS,$(object-suffixes-$(lib))),\
$($(lib)-shared-only-routines),\
$(all-$(lib)-routines))))
ifneq (,$(filter .os,$(object-suffixes-$(lib))))
extra-objs += $(all-$(lib)-routines:%=%.os)
extra-objs += $(patsubst %,%.os,$(filter-out $($(lib)-static-only-routines),\
$(all-$(lib)-routines)))
endif
ifneq (,$(filter .oS,$(object-suffixes-$(lib))))
extra-objs += $(patsubst %,%.oS,$(filter $($(lib)-static-only-routines),\
$(all-$(lib)-routines)))
endif
alltypes-$(lib) := $(foreach o,$(object-suffixes-$(lib)),\
$(objpfx)$(patsubst %,$(libtype$o),\