* extra-lib.mk (install-lib, extra-objs, alltypes-$(lib)): Make

sure these are simply-expanded variables.
This commit is contained in:
Roland McGrath 1995-04-08 19:23:00 +00:00
parent 883bc19b7c
commit 6aa8372e16
2 changed files with 11 additions and 3 deletions

View File

@ -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.

View File

@ -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