| Index: Makerules
|
| diff --git a/Makerules b/Makerules
|
| index 40df67447d00fa0843aea0b33340c256fa3f3d59..c9942ea59fd64a2586581fece005656d15885222 100644
|
| --- a/Makerules
|
| +++ b/Makerules
|
| @@ -388,7 +388,7 @@ endif
|
| # Bounded pointer thunks are only built for *.ob
|
| elide-bp-thunks = $(addprefix $(bppfx),$(bp-thunks))
|
|
|
| -elide-routines.oS += $(filter-out $(static-only-routines),\
|
| +elide-routines.ons += $(filter-out $(static-only-routines),\
|
| $(routines) $(aux) $(sysdep_routines)) \
|
| $(elide-bp-thunks)
|
| elide-routines.os += $(static-only-routines) $(elide-bp-thunks)
|
| @@ -955,7 +955,7 @@ ifndef subdir
|
| install: $(inst_libdir)/libc.so
|
| $(inst_libdir)/libc.so: $(common-objpfx)format.lds \
|
| $(common-objpfx)libc.so$(libc.so-version) \
|
| - $(inst_libdir)/$(patsubst %,$(libtype.oS),\
|
| + $(inst_libdir)/$(patsubst %,$(libtype.ons),\
|
| $(libprefix)$(libc-name)) \
|
| $(+force)
|
| # TODO(mseaborn): I made the paths here non-absolute so that the
|
| @@ -967,7 +967,7 @@ $(inst_libdir)/libc.so: $(common-objpfx)format.lds \
|
| echo ' the static library, so try that secondarily. */';\
|
| cat $<; \
|
| echo 'GROUP ( libc.so$(libc.so-version)' \
|
| - '$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
|
| + '$(patsubst %,$(libtype.ons),$(libprefix)$(libc-name))'\
|
| ' AS_NEEDED (' $(rtld-installed-name) ') )' \
|
| ) > $@.new
|
| mv -f $@.new $@
|
|
|