diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | extra-lib.mk | 11 |
2 files changed, 11 insertions, 3 deletions
@@ -1,5 +1,8 @@ Sat Apr 8 00:40:59 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> + * extra-lib.mk (install-lib, extra-objs, alltypes-$(lib)): Make + sure these are simply-expanded variables. + * locale/loadlocale.c (_nl_load_locale): Use MAP_INHERIT flag in mmap call. diff --git a/extra-lib.mk b/extra-lib.mk index 436170e0d0..d4d2b52829 100644 --- a/extra-lib.mk +++ b/extra-lib.mk @@ -10,12 +10,17 @@ extra-libs-left := $(filter-out $(lib),$(extra-libs-left)) object-suffixes-$(lib) := $(filter-out $($(lib)-inhibit-o),$(object-suffixes)) +# Make sure these are simply-expanded variables before we append to them, +# since we want the expressions we we append to be expanded right now. +install-lib := $(install-lib) +extra-objs := $(extra-objs) + # 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,$(object-suffixes-$(lib)),$($(lib)-routines:=$o)) -alltypes-$(lib) = $(foreach o,$(object-suffixes-$(lib)),\ - $(objpfx)$(patsubst %,$(libtype$o),\ - $(lib:lib%=%))) +alltypes-$(lib) := $(foreach o,$(object-suffixes-$(lib)),\ + $(objpfx)$(patsubst %,$(libtype$o),\ + $(lib:lib%=%))) ifneq (,$(filter .so,$(object-suffixes-$(lib)))) alltypes-$(lib) += $(objpfx)$(lib).so endif |