* gcc_update (touch_files_reexec): New function, run after the

tree is modified.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@33882 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 14 insertions, 4 deletions

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index fe996861557..834966b3a08 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-12  Alexandre Oliva  <aoliva@cygnus.com>
+
+	* gcc_update (touch_files_reexec): New function, run after the
+	tree is modified.
+
 2000-05-08  Richard Hendeson  <rth@cygnus.com>
 
 	* gcc_update: Remove references to inclhack.tpl.
diff --git a/contrib/gcc_update b/contrib/gcc_update
index d8591fbb02b..a8d2ed7cc32 100755
--- a/contrib/gcc_update
+++ b/contrib/gcc_update
@@ -112,6 +112,13 @@ touch_files () {
     done
 }
 
+# Whenever we update the tree or install a patch, we may be modifying
+# this script.  By re-execing it, we ensure that the appropriate
+# dependencies and rules will be used.
+touch_files_reexec () {
+    echo "Adjusting file timestamps"
+    exec ${CONFIG_SHELL-/bin/sh} $0 --touch
+}    
 
 # This functions applies a patch to an existing tree.
 apply_patch () {
@@ -126,8 +133,7 @@ apply_patch () {
 	    cat $1 | patch -p1 ;;
 	esac
     fi
-    echo "Adjusting file timestamps"
-    touch_files
+    touch_files_reexec
 }
 
 # Check whether this indeed looks like a local tree.
@@ -197,5 +203,4 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-echo "Adjusting file timestamps"
-touch_files
+touch_files_reexec