picnoir
/
glibc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Shorten build commands" 

This reverts commit 59d9f1d698.
This commit is contained in:
Roland McGrath 2010-04-09 15:18:58 -07:00
parent 3aa6513708
commit 4ae73ca00a
4 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -16,14 +16,6 @@
* malloc/malloc.c (_int_malloc): Return NULL if printing error message
returns.
2010-03-30 Daniel Jacobowitz <dan@codesourcery.com>
* Makeconfig (+common-includes): Define.
(+includes): Use @$(common-objpfx)includes.
* Makefile (postclean): Remove includes and includes.mk.
* Makerules ($(common-objpfx)includes.mk): Include and create
includes.mk. Create includes.
2010-04-07 Andreas Schwab <schwab@redhat.com>
* sysdeps/unix/sysv/linux/i386/fallocate.c: Set errno on error.

5
Makeconfig
View File

@ -670,10 +670,9 @@ endif # $(+cflags) == ""
# library source directory, in the include directory, and in the
# current directory.
+sysdep-includes = $(addprefix -I,$(+sysdep_dirs))
+common-includes = $(+sysdep-includes) $(includes) $(sysincludes)
+includes = -I$(..)include $(if $(subdir),$(objpfx:%/=-I%)) \
@$(common-objpfx)includes \
$(patsubst %/,-I%,$(..)) $(libio-include) -I.
$(+sysdep-includes) $(includes) \
$(patsubst %/,-I%,$(..)) $(libio-include) -I. $(sysincludes)
# Since libio has several internal header files, we use a -I instead
# of many little headers in the include directory.

2
Makefile
View File

@ -227,7 +227,7 @@ parent-mostlyclean: common-mostlyclean # common-mostlyclean is in Makerules.
parent-clean: parent-mostlyclean common-clean
postclean = $(addprefix $(common-objpfx),$(postclean-generated)) \
$(addprefix $(objpfx),sysd-dirs sysd-rules includes includes.mk) \
$(addprefix $(objpfx),sysd-dirs sysd-rules) \
$(addprefix $(objpfx),sysd-sorted soversions.mk soversions.i)
clean: parent-clean

14
Makerules
View File

@ -267,20 +267,6 @@ ifndef sysd-rules-done
no_deps=t
endif
-include $(common-objpfx)includes.mk
ifneq ($(+common-includes),$(saved-includes))
# Recreate includes.mk (and includes).
includes-force = FORCE
FORCE:
endif
$(common-objpfx)includes.mk: $(includes-force)
-@rm -f $@T $(common-objpfx)includesT
for inc in $(+common-includes); do echo "$$inc"; done \
> $(common-objpfx)includesT
mv -f $(common-objpfx)includesT $(common-objpfx)includes
echo 'saved-includes := $(+common-includes)' > $@T
mv -f $@T $@
define o-iterator-doit
$(objpfx)%$o: %.S $(before-compile); $$(compile-command.S)
endef