diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-07-29 21:04:09 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-08-13 09:58:33 -0700 |
| commit | 545a42f7bf800128c171202430143dd30b96c2d9 (patch) | |
| tree | 69b44ffb0c1167d5522eca3822b12321d3b07c81 | |
| parent | a6bd872286b981b08577218c00e1ea693bad6095 (diff) | |
| download | glibc-hjl/pr21864/master.tar.gz glibc-hjl/pr21864/master.tar.xz glibc-hjl/pr21864/master.zip | |
Don't compile non-lib modules as lib modules [BZ #21864] hjl/pr21864/master
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.
| -rw-r--r-- | Makerules | 3 | ||||
| -rw-r--r-- | catgets/Makefile | 1 | ||||
| -rw-r--r-- | elf/Makefile | 1 | ||||
| -rw-r--r-- | nss/Makefile | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/Makerules b/Makerules index 9bb707c168..8f1324d8e9 100644 --- a/Makerules +++ b/Makerules @@ -1359,7 +1359,8 @@ lib := testsuite include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) endif -all-nonlib := $(strip $(tests-internal) $(test-internal-extras) $(others)) +all-nonlib := $(strip $(tests-internal) $(test-internal-extras) \ + $(others) $(others-extras)) ifneq (,$(all-nonlib)) cpp-srcs-left = $(all-nonlib) lib := nonlib diff --git a/catgets/Makefile b/catgets/Makefile index e5f49491fb..39aab67c14 100644 --- a/catgets/Makefile +++ b/catgets/Makefile @@ -38,6 +38,7 @@ tests-special += $(objpfx)tst-catgets-mem.out endif gencat-modules = xmalloc +others-extras = $(gencat-modules) # To find xmalloc.c vpath %.c ../locale/programs diff --git a/elf/Makefile b/elf/Makefile index d314a5fa7e..7cf959aabd 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -112,6 +112,7 @@ install-rootsbin += ldconfig ldconfig-modules := cache readlib xmalloc xstrdup chroot_canon static-stubs extra-objs += $(ldconfig-modules:=.o) +others-extras = $(ldconfig-modules) endif endif diff --git a/nss/Makefile b/nss/Makefile index d9f6d41181..87a0ed7134 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -46,6 +46,7 @@ CPPFLAGS-getent.c = -DHAVE_SUNRPC=$(have-sunrpc) others := getent makedb install-bin := getent makedb makedb-modules = xmalloc hash-string +others-extras = $(makedb-modules) extra-objs += $(makedb-modules:=.o) tests-static = tst-field |