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

HawGoo · Mar 13, 2013 · 9dc7c64 · 9dc7c64
1 parent 05087fb
commit 9dc7c64
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-13  Andreas Schwab  <[email protected]>
+
+	* extra-lib.mk (extra-objs): Add static-only-routines as .oS
+	instead of .os.
+
 2013-03-13  Joseph Myers  <[email protected]>
 
 	* timezone/zic.c: Update from tzcode 2013b.

diff --git 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),\