From 9eaf7da0942407021382e5d0e6a251017c0e698c Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Sat, 20 Nov 2004 10:49:16 +0000 Subject: [PATCH] gcc_update (touch_files): Don't rely on "make" being GNU make... * gcc_update (touch_files): Don't rely on "make" being GNU make; grep for "Touching" to determine that the rule executes. From-SVN: r90961 --- contrib/ChangeLog | 5 +++++ contrib/gcc_update | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index c351739622f..da4eae5166f 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2004-11-20 Hans-Peter Nilsson + + * gcc_update (touch_files): Don't rely on "make" being GNU make; + grep for "Touching" to determine that the rule executes. + 2004-11-14 Hans-Peter Nilsson * gcc_update (touch_files): Explicitly pass --no-print-directory. diff --git a/contrib/gcc_update b/contrib/gcc_update index 9b39ae2989f..7e0e837e1af 100755 --- a/contrib/gcc_update +++ b/contrib/gcc_update @@ -129,12 +129,15 @@ touch_files () { echo ' touch $@' >> Makefile.$$ files_and_dependencies | sed 's,[^ ]* ,,;s,$, :,' >> Makefile.$$ - # We need to explicitly shut off the "Entering... Leaving..." + # We would have 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 + # Unfortunately we do not require GNU make other than for building + # and testing, so let's just grep known text explicitly echoed by + # the rule. + while ${MAKE-make} -s -f Makefile.$$ all | grep Touching > /dev/null; do sleep 1 done 2>&1 rm -f Makefile.$$