aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Jacobowitz <dan@codesourcery.com>2010-04-08 16:48:17 -0700
committerUlrich Drepper <drepper@redhat.com>2010-04-08 16:48:17 -0700
commit59d9f1d6983fc9b606a1f9214fb817efe3d6cff8 (patch)
treecadc1d564288b21d3aec3bb4463d348617e727bb
parenta7b420eadcd706702b5244dfa3beee06c7a990aa (diff)
downloadglibc-59d9f1d6983fc9b606a1f9214fb817efe3d6cff8.zip
glibc-59d9f1d6983fc9b606a1f9214fb817efe3d6cff8.tar.gz
glibc-59d9f1d6983fc9b606a1f9214fb817efe3d6cff8.tar.bz2
Shorten build commands
This patch scratches an itch. Each individual gcc command in the glibc build is over 1K, which means it takes up a good chunk of my terminal. Most of that is include paths. Any version of GCC new enough to build glibc supports response files, which were added in 2005. So use a response file for the static list of include paths. Now the build commands are a lot shorter, and easier to use when developing glibc.
-rw-r--r--ChangeLog8
-rw-r--r--Makeconfig5
-rw-r--r--Makefile2
-rw-r--r--Makerules14
4 files changed, 26 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e53d5bf..c35f5ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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.
diff --git a/Makeconfig b/Makeconfig
index cd77fe1..dc81545 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -670,9 +670,10 @@ 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%)) \
- $(+sysdep-includes) $(includes) \
- $(patsubst %/,-I%,$(..)) $(libio-include) -I. $(sysincludes)
+ @$(common-objpfx)includes \
+ $(patsubst %/,-I%,$(..)) $(libio-include) -I.
# Since libio has several internal header files, we use a -I instead
# of many little headers in the include directory.
diff --git a/Makefile b/Makefile
index 61cfa43..d2327b3 100644
--- a/Makefile
+++ b/Makefile
@@ -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) \
+ $(addprefix $(objpfx),sysd-dirs sysd-rules includes includes.mk) \
$(addprefix $(objpfx),sysd-sorted soversions.mk soversions.i)
clean: parent-clean
diff --git a/Makerules b/Makerules
index bf03b38..9986730 100644
--- a/Makerules
+++ b/Makerules
@@ -267,6 +267,20 @@ 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