Backport from mainline

        2012-05-09  David Edelsohn  <dje.gcc@gmail.com>

        * gcc_update: Use $GCC_SVN to retrieve branch and revision.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@207406 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index abdea93..9389de7 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,10 @@
+2014-02-02  Uros Bizjak  <ubizjak@gmail.com>
+
+       Backport from mainline
+       2012-05-09  David Edelsohn  <dje.gcc@gmail.com>
+
+       * gcc_update: Use $GCC_SVN to retrieve branch and revision.
+
 2013-04-11  Release Manager
 
        * GCC 4.7.3 released.

diff --git a/contrib/gcc_update b/contrib/gcc_update
index b81fc0c..b49a4bb 100755 (executable)
--- a/contrib/gcc_update
+++ b/contrib/gcc_update
@@ -367,8 +367,8 @@ case $vcs_type in
            exit 1
        fi
 
-       revision=`svn info | awk '/Revision:/ { print $2 }'`
-       branch=`svn info | sed -ne "/URL:/ {
+       revision=`$GCC_SVN info | awk '/Revision:/ { print $2 }'`
+       branch=`$GCC_SVN info | sed -ne "/^URL:/ {
            s,.*/trunk,trunk,
            s,.*/branches/,,
            s,.*/tags/,,