diff options
| author | Hans-Peter Nilsson <hp@bitrange.com> | 2004-11-20 10:49:16 +0000 |
|---|---|---|
| committer | Hans-Peter Nilsson <hp@gcc.gnu.org> | 2004-11-20 10:49:16 +0000 |
| commit | 9eaf7da0942407021382e5d0e6a251017c0e698c (patch) | |
| tree | 4e6a13087b6920c7ea4e8e69967c0a4526840889 /contrib/gcc_update | |
| parent | a5436b2f52f0842b760e462b0863fe4dfebdba75 (diff) | |
| download | gcc-9eaf7da0942407021382e5d0e6a251017c0e698c.zip gcc-9eaf7da0942407021382e5d0e6a251017c0e698c.tar.gz gcc-9eaf7da0942407021382e5d0e6a251017c0e698c.tar.bz2 | |
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
Diffstat (limited to 'contrib/gcc_update')
| -rwxr-xr-x | contrib/gcc_update | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/gcc_update b/contrib/gcc_update index 9b39ae2..7e0e837 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.$$ |