AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-09 14:50:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Omit libc-modules.h for all .v.i files.

Browse Source
This commit is contained in:
Roland McGrath 2015-04-09 14:42:29 -07:00
parent 054392910b
commit 8a257e2cb5
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2015-04-09 Roland McGrath <roland@hack.frob.com>
* Makeconfig (module-cppflags): Exclude all .v.i files.
(skip-module-cppflags): Variable removed.
* configure.ac (libc_config_ok): Initialize before reading
preconfigure scripts, not after.
* configure: Regenerated.

16
Makeconfig
View File

@ -848,12 +848,6 @@ built-modules = iconvprogs iconvdata ldconfig lddlibc4 libmemusage \
libSegFault libpcprofile librpcsvc locale-programs \
memusagestat nonlib nscd extramodules libnldbl
# We don't include libc-modules.h when these targets are being built. These
# targets don't (and will likely never need to) use the IS_IN facility. In
# fact, shlib-versions should not use it because that will create a circular
# dependency as libc-modules.h is generated from shlib-versions.
skip-module-cppflags = shlib-versions.v.i Versions.v.i
in-module = $(subst -,_,$(firstword $(libof-$(basename $(@F))) \
$(libof-$(<F)) \
$(libof-$(@F)) \
@ -862,10 +856,12 @@ in-module = $(subst -,_,$(firstword $(libof-$(basename $(@F))) \
module-cppflags-real = -include $(common-objpfx)libc-modules.h \
-DMODULE_NAME=$(in-module)
# We don't need libc-modules.h and the MODULE_NAME definition for
# shlib-version.v.i.
module-cppflags = $(if $(filter $(@F),$(skip-module-cppflags)), \
,$(module-cppflags-real))
# We don't need libc-modules.h and the MODULE_NAME definition for .v.i
# files. These targets don't (and will likely never need to) use the IS_IN
# facility. In fact, shlib-versions should not use it because that will
# create a circular dependency as libc-modules.h is generated from
# shlib-versions.
module-cppflags = $(if $(filter %.v.i,$(@F)),,$(module-cppflags-real))
# These are the variables that the implicit compilation rules use.
# Note that we can't use -std=* in CPPFLAGS, because it overrides