From dbfa75a1b739ae83e477ae4f373415d459ff78f7 Mon Sep 17 00:00:00 2001
From: hp <hp@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 14 Nov 2004 06:31:00 +0000
Subject: [PATCH] * gcc_update (touch_files): Explicitly pass
--no-print-directory.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90614 138bc75d-0d04-0410-961f-82ee72b054a4
---
contrib/ChangeLog | 4 ++++
contrib/gcc_update | 8 +++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 855c6be0f4e7..c351739622fb 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-14 Hans-Peter Nilsson <hp@bitrange.com>
+
+ * gcc_update (touch_files): Explicitly pass --no-print-directory.
+
2004-11-04 Andrew Pinski <pinskia@physics.uc.edu>
* gcc_update (boehm-gc/aclocal.m4): Remove boehm-gc/acinclude.m4.
diff --git a/contrib/gcc_update b/contrib/gcc_update
index 55a7d6a9e8a2..9b39ae2989f2 100755
--- a/contrib/gcc_update
+++ b/contrib/gcc_update
@@ -128,7 +128,13 @@ touch_files () {
echo ' echo Touching $@... 1>&2; \' >> Makefile.$$
echo ' touch $@' >> Makefile.$$
files_and_dependencies | sed 's,[^ ]* ,,;s,$, :,' >> Makefile.$$
- while ${MAKE-make} -s -f Makefile.$$ all | grep . > /dev/null; do
+
+ # We need to explicitly shut off the "Entering... Leaving..."
+ # messages through "--no-print-directory" to handle the case when
+ # we were called from a recursive invocation (i.e. "$(MAKE)" in a
+ # Makefile, not just make). Passing only "-s" doesn't help then,
+ # because make has helpfully added "-w" to MAKEFLAGS automatically.
+ while ${MAKE-make} -s --no-print-directory -f Makefile.$$ all | grep . > /dev/null; do
sleep 1
done 2>&1
rm -f Makefile.$$
--
GitLab