OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't read sysd-sorted unless sysd-dirs is read.

Browse Source
This commit is contained in:
Ulrich Drepper 1998-11-23 09:30:46 +00:00
parent 1521f3a5de
commit 9dc09d3060
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makeconfig
View File

@ -742,12 +742,6 @@ endif
ifndef avoid-generated ifndef avoid-generated
-include $(common-objpfx)sysd-dirs -include $(common-objpfx)sysd-dirs
define \n
endef
sysdep-subdirs := $(subst $(\n), ,$(sysdep-subdirs))
sysdep-inhibit-subdirs := $(subst $(\n), ,$(sysdep-inhibit-subdirs))
endif endif
# These are the subdirectories containing the library source. The order # These are the subdirectories containing the library source. The order
@ -762,8 +756,10 @@ all-subdirs = csu assert ctype db db2 locale intl catgets math setjmp signal\
$(binfmt-subdir) $(binfmt-subdir)
all-subdirs := $(filter-out $(sysdep-inhibit-subdirs),$(all-subdirs)) all-subdirs := $(filter-out $(sysdep-inhibit-subdirs),$(all-subdirs))
ifeq ($(sysd-dirs-done),t)
-include $(common-objpfx)sysd-sorted -include $(common-objpfx)sysd-sorted
subdirs = $(sorted-subdirs) subdirs = $(sorted-subdirs)
endif
# The mach and hurd subdirectories have many generated header files which # The mach and hurd subdirectories have many generated header files which
# much of the rest of the library depends on, so it is best to build them # much of the rest of the library depends on, so it is best to build them
@ -776,12 +772,12 @@ subdirs := $(filter mach,$(subdirs)) $(filter hurd,$(subdirs)) \
all-Subdirs-files = $(wildcard $(config-sysdirs:%=$(..)%/Subdirs)) all-Subdirs-files = $(wildcard $(config-sysdirs:%=$(..)%/Subdirs))
$(common-objpfx)sysd-dirs: $(common-objpfx)config.make $(all-Subdirs-files) $(common-objpfx)sysd-dirs: $(common-objpfx)config.make $(all-Subdirs-files)
(echo define sysdep-subdirs; \ ($(AWK) 'END { printf ("sysdep-subdirs =") }' /dev/null; \
sed 's/[#-].*$$//' $(all-Subdirs-files) /dev/null; \ $(AWK) '/^[^#-]/ { printf (" %s", $$0) }' $(all-Subdirs-files);\
echo endef; \ echo; \
echo define sysdep-inhibit-subdirs; \ $(AWK) 'END { printf ("sysdep-inhibit-subdirs =") }' /dev/null;\
sed '/-.*$$/!d;s/^-//' $(all-Subdirs-files) /dev/null; \ $(AWK) '/^-/ { printf (" %s", $$0) }' $(all-Subdirs-files); \
echo endef; \ echo; \
echo 'sysd-dirs-done = t'; \ echo 'sysd-dirs-done = t'; \
) > $@-tmp ) > $@-tmp
mv -f $@-tmp $@ mv -f $@-tmp $@