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
This commit is contained in:
parent
a5436b2f52
commit
9eaf7da094
|
@ -1,3 +1,8 @@
|
||||||
|
2004-11-20 Hans-Peter Nilsson <hp@bitrange.com>
|
||||||
|
|
||||||
|
* 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 <hp@bitrange.com>
|
2004-11-14 Hans-Peter Nilsson <hp@bitrange.com>
|
||||||
|
|
||||||
* gcc_update (touch_files): Explicitly pass --no-print-directory.
|
* gcc_update (touch_files): Explicitly pass --no-print-directory.
|
||||||
|
|
|
@ -129,12 +129,15 @@ touch_files () {
|
||||||
echo ' touch $@' >> Makefile.$$
|
echo ' touch $@' >> Makefile.$$
|
||||||
files_and_dependencies | sed 's,[^ ]* ,,;s,$, :,' >> 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
|
# messages through "--no-print-directory" to handle the case when
|
||||||
# we were called from a recursive invocation (i.e. "$(MAKE)" in a
|
# we were called from a recursive invocation (i.e. "$(MAKE)" in a
|
||||||
# Makefile, not just make). Passing only "-s" doesn't help then,
|
# Makefile, not just make). Passing only "-s" doesn't help then,
|
||||||
# because make has helpfully added "-w" to MAKEFLAGS automatically.
|
# 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
|
sleep 1
|
||||||
done 2>&1
|
done 2>&1
|
||||||
rm -f Makefile.$$
|
rm -f Makefile.$$
|
||||||
|
|
Loading…
Reference in New Issue