qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't compile non-lib modules as lib modules [BZ #21864] 

Some programs have more than one source files.  These non-lib modules
should not be compiled with -DMODULE_NAME=libc.  This patch puts these
non-lib modules in $(others-extras) and adds $(others-extras) to
all-nonlib.

	[BZ #21864]
	* Makerules (all-nonlib): Add $(others-extras).
	* catgets/Makefile (others-extras): New.
	* elf/Makefile (others-extras): Likewise.
	* nss/Makefile (others-extras): Likewise.
This commit is contained in:
H.J. Lu 2017-07-29 21:04:09 -07:00
parent 54e4b8f215
commit 7b3ce39538
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makerules
View File

@ -1359,7 +1359,8 @@ lib := testsuite
include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
endif endif
all-nonlib := $(strip $(tests-internal) $(test-internal-extras) $(others)) all-nonlib := $(strip $(tests-internal) $(test-internal-extras) \
$(others) $(others-extras))
ifneq (,$(all-nonlib)) ifneq (,$(all-nonlib))
cpp-srcs-left = $(all-nonlib) cpp-srcs-left = $(all-nonlib)
lib := nonlib lib := nonlib

1
catgets/Makefile
View File

@ -38,6 +38,7 @@ tests-special += $(objpfx)tst-catgets-mem.out
endif endif
gencat-modules = xmalloc gencat-modules = xmalloc
others-extras = $(gencat-modules)
# To find xmalloc.c # To find xmalloc.c
vpath %.c ../locale/programs vpath %.c ../locale/programs

1
elf/Makefile
View File

@ -112,6 +112,7 @@ install-rootsbin += ldconfig
ldconfig-modules := cache readlib xmalloc xstrdup chroot_canon static-stubs ldconfig-modules := cache readlib xmalloc xstrdup chroot_canon static-stubs
extra-objs += $(ldconfig-modules:=.o) extra-objs += $(ldconfig-modules:=.o)
others-extras = $(ldconfig-modules)
endif endif
endif endif

1
nss/Makefile
View File

@ -47,6 +47,7 @@ CPPFLAGS-getent.c = -DHAVE_SUNRPC=$(have-sunrpc)
others := getent makedb others := getent makedb
install-bin := getent makedb install-bin := getent makedb
makedb-modules = xmalloc hash-string makedb-modules = xmalloc hash-string
others-extras = $(makedb-modules)
extra-objs += $(makedb-modules:=.o) extra-objs += $(makedb-modules:=.o)
tests-static = tst-field tests-static = tst-field