diff options
| author | Roland McGrath <roland@gnu.org> | 2002-10-16 22:09:55 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-10-16 22:09:55 +0000 |
| commit | 0a951d0e31b5fb34f7e0428e933d7df55ef7f94d (patch) | |
| tree | 2a33901f73f75e1d97df6b16495909d3c1f37c6e /Makeconfig | |
| parent | 0d83b42e2d59b722a66c7e3fed50437a647ed4ee (diff) | |
| download | glibc-0a951d0e31b5fb34f7e0428e933d7df55ef7f94d.zip glibc-0a951d0e31b5fb34f7e0428e933d7df55ef7f94d.tar.gz glibc-0a951d0e31b5fb34f7e0428e933d7df55ef7f94d.tar.bz2 | |
* cppflags-iterator.mk (CPPFLAGS-$(cpp-src)): Variable removed.
instead of += to append, to be sure $(lib) gets expanded at defn time.
(libof-$(cpp-src)): New variable, define this instead.
* extra-lib.mk (cpp-srcs-left): Reduce duplication in include setup.
(lib): Don't use override.
(CPPFLAGS-$(lib)): New variable, put -D's here.
* Makeconfig (CPPFLAGS): Use basename fn for CPPFLAGS-basename.
Also add $(CPPFLAGS-LIB) before the file-specific flags, for each
LIB found by $(libof-*) for basename, target, or source.
* Makerules (CPPFLAGS-nonlib): New variable.
* nscd/Makefile (lib): Set to nonlib when using cppflags-iterator.mk.
* locale/Makefile (lib): Likewise.
* sunrpc/Makefile (lib): Likewise.
* sysdeps/unix/sysv/linux/fpathconf.c (LINUX_LINK_MAX): Move macro ...
* sysdeps/unix/sysv/linux/linux_fsinfo.h (LINUX_LINK_MAX): ... here.
* sysdeps/unix/sysv/linux/pathconf.h: New file.
(statfs_link_max): New function, guts from fpathconf.c.
* sysdeps/unix/sysv/linux/fpathconf.c: Rewritten using that.
* sysdeps/unix/sysv/linux/pathconf.c (__pathconf): Likewise.
* sysdeps/unix/sysv/linux/alpha/pathconf.c (__pathconf): Rewritten
to use the linux/pathconf.c code by #include rather than duplication.
* sysdeps/unix/sysv/linux/alpha/fpathconf.c (__pathconf): Likewise.
2002-10-16 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/x86_64/sysdep.h (SYSCALL_ERROR_HANDLER):
Use __libc_errno only for libc itself.
Diffstat (limited to 'Makeconfig')
| -rw-r--r-- | Makeconfig | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -632,8 +632,10 @@ libio-include = -I$(..)libio # it causes cpp to stop predefining __ASSEMBLER__. CPPFLAGS = $($(subdir)-CPPFLAGS) $(+includes) $(defines) \ -include $(..)include/libc-symbols.h $(sysdep-CPPFLAGS) \ - $(CPPFLAGS-$(suffix $@)) $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) \ - $(CPPFLAGS-$(patsubst %$(suffix $@),%,$(@F))) + $(CPPFLAGS-$(suffix $@)) \ + $(foreach L,$(libof-$(basename $(@F))) $(libof-$<) $(libof-$(@F)),\ + $(CPPFLAGS-$L)) \ + $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F))) override CFLAGS = -std=gnu99 \ $(filter-out %frame-pointer,$(+cflags)) $(sysdep-CFLAGS) \ $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) $(CFLAGS-$(@F)) |