diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | extra-lib.mk | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 2cb0ed60d9..c4cb2c811a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/extra-lib.mk b/extra-lib.mk index a2293c5c6e..247946f6aa 100644 --- a/extra-lib.mk +++ b/extra-lib.mk @@ -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),\ |