diff options
| author | Roland McGrath <roland@gnu.org> | 1996-06-14 12:05:04 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1996-06-14 12:05:04 +0000 |
| commit | f332db025658c36adaad3759d438ef5117a595c8 (patch) | |
| tree | 2991fb69f1636a5fdaac65487bdae343535bc6c8 /Makeconfig | |
| parent | 9f70e81bcaa12b0673cd0879d6f4a21ad6dddce5 (diff) | |
| download | glibc-f332db025658c36adaad3759d438ef5117a595c8.tar.gz glibc-f332db025658c36adaad3759d438ef5117a595c8.tar.xz glibc-f332db025658c36adaad3759d438ef5117a595c8.zip | |
Fri Jun 14 01:51:47 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> cvs/libc-960615
* version.c (banner): New static const variable, complete version banner text. (__libc_print_version): Use it, and use __write instead of printf. * configure.in (sysnames): Don't cache the value, because it depends only on libc sources. Merge uniquifying third pass into Implies/parent expansion second pass. Report each unique name as it is added in partial report string, terminated when finished. * Makeconfig (sysdep_dir): Move defn before config.status rule that expands it. (sysdep-configures): Variable removed. (config.status): Use its contents directly, tighten up a bit, and include Implies files. * elf/dl-open.c (_dl_open) [PIC]: Set PARENT to _dl_loaded if null. * elf/Makefile ($(objpfx)$(rtld-installed-name)): Make a symlink. * sysdeps/mach/hurd/dl-sysdep.c (_dl_sysdep_open_zero_fill): Add comment. * elf/rtld.c (dl_main): Close _dl_zerofd after mapping deps. * sysdeps/generic/machine-gmon.h [NO_UNDERSCORES]: Define mcount as weak alias for _mcount. * sysdeps/alpha/_mcount.S (mcount): Define as weak alias.
Diffstat (limited to 'Makeconfig')
| -rw-r--r-- | Makeconfig | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/Makeconfig b/Makeconfig index 1d534580b1..afbb31f2fa 100644 --- a/Makeconfig +++ b/Makeconfig @@ -74,6 +74,10 @@ common-objdir = . endif endif +# Root of the sysdeps tree. +sysdep_dir := $(..)sysdeps +export sysdep_dir := $(sysdep_dir) + # Get the values defined by options to `configure'. include $(common-objpfx)config.make @@ -86,17 +90,15 @@ include $(common-objpfx)config.make $(common-objpfx)config.make: $(common-objpfx)config.status $(..)config.h.in cd $(<D); $(SHELL) $(<F) +sysdep-configures = \ + # Find all the sysdeps configure fragments, to make sure we re-run # configure when any of them changes. -sysdep-configures = \ - $(foreach dir,$(config-sysdirs),\ - $(patsubst %.in,%,\ - $(firstword $(wildcard \ - $(sysdep_dir)/$(dir)/configure \ - $(sysdep_dir)/$(dir)/configure.in)))) - -# Force the user to configure before making. -$(common-objpfx)config.status: $(..)configure $(sysdep-configures) +$(common-objpfx)config.status: $(..)configure \ + $(foreach dir,$(config-sysdirs),\ + $(patsubst %.in,%,\ + $(firstword $(wildcard \ + $(addprefix $(sysdep_dir)/$(dir)/,configure configure.in Implies))))) @cd $(@D); if test -f $(@F); then exec $(SHELL) $(@F) --recheck; else \ echo The GNU C library has not been configured. >&2; \ echo Run \`configure\' to configure it before building. >&2; \ @@ -112,9 +114,6 @@ ifneq ($(wildcard $(objpfx)configparms),) include $(objpfx)configparms endif endif - -sysdep_dir := $(..)sysdeps -export sysdep_dir := $(sysdep_dir) #### #### These are the configuration variables. You can define values for |