Skip to content

Commit

Permalink
* extra-lib.mk (install-lib, extra-objs, alltypes-$(lib)): Make
Browse files Browse the repository at this point in the history
 	sure these are simply-expanded variables.
  • Loading branch information
Roland McGrath committed Apr 8, 1995
1 parent 883bc19 commit 6aa8372
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
11 changes: 8 additions & 3 deletions extra-lib.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6aa8372

Please sign in to comment.