* gcc_release (build_sources): Pass --disable-multilib to

	gcc_build.
	(SVN): Don't use full path.

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

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 712fd07..9431ecb 100644 (file)
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-28  Joseph Myers  <joseph@codesourcery.com>
+
+       * gcc_release (build_sources): Pass --disable-multilib to
+       gcc_build.
+       (SVN): Don't use full path.
+

 2008-01-21  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
        * update_web_docs_libstdcxx_svn: "docs" dir moved to "doc".
 2008-01-21  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
        * update_web_docs_libstdcxx_svn: "docs" dir moved to "doc".

diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index a5d14cd..bacb25b 100755 (executable)
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -216,7 +216,7 @@ EOF
     inform "Building compiler"
     OBJECT_DIRECTORY=../objdir
     contrib/gcc_build -d ${SOURCE_DIRECTORY} -o ${OBJECT_DIRECTORY} \
     inform "Building compiler"
     OBJECT_DIRECTORY=../objdir
     contrib/gcc_build -d ${SOURCE_DIRECTORY} -o ${OBJECT_DIRECTORY} \

-      -c "--enable-generated-files-in-srcdir" build || \
+      -c "--enable-generated-files-in-srcdir --disable-multilib" build || \

       error "Could not rebuild GCC"
   fi
 
       error "Could not rebuild GCC"
   fi
 


@@ -505,7 +505,7 @@ export LC_ALL
 DATE=`date "+%Y%m%d"`
 LONG_DATE=`date "+%Y-%m-%d"`
 
 DATE=`date "+%Y%m%d"`
 LONG_DATE=`date "+%Y-%m-%d"`
 

-SVN=${SVN:-/usr/bin/svn}
+SVN=${SVN:-svn}

 # The CVS server containing the GCC repository.
 SVN_SERVER="gcc.gnu.org"
 # The path to the repository on that server.
 # The CVS server containing the GCC repository.
 SVN_SERVER="gcc.gnu.org"
 # The path to the repository on that server.