aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorsteven <>2005-11-03 20:56:05 +0000
committersteven <>2005-11-03 20:56:05 +0000
commitc8eaa9249ab21c600f5bdb16b7bc271b08957d4d (patch)
tree4e7a74737a6f53cedf58315a271cea6e86788640 /contrib
parentfda434eb2d7e6d9a5ffabed9561a8ada9f82a3b5 (diff)
* gcc_build: Fix my previous checking.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/ChangeLog4
-rwxr-xr-xcontrib/gcc_build7
2 files changed, 9 insertions, 2 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index caa477ccd3f..d3417e623fc 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-03 Steven Bosscher <stevenb@suse.de>
+
+ * gcc_build: Fix my previous checking.
+
2005-11-01 Joseph S. Myers <joseph@codesourcery.com>
* gcc_update: Include revision number in LAST_UPDATED.
diff --git a/contrib/gcc_build b/contrib/gcc_build
index 7ad2484e216..899ae3ecd08 100755
--- a/contrib/gcc_build
+++ b/contrib/gcc_build
@@ -201,7 +201,8 @@ SVN_SERVER="gcc.gnu.org"
# The path to the repository on that server.
SVN_REPOSITORY="/svn/gcc/"
# The branch to check out from that server.
-SVN_BRANCH="trunk"
+# Defaults to trunk if no branch is defined with -b.
+SVN_BRANCH=""
# The SVN protocol to use.
SVN_PROTOCOL="svn"
# The username to use when connecting to the server.
@@ -285,7 +286,9 @@ if [ ${CHECKOUT} -eq 0 ] && test -n "${SVN_BRANCH}"; then
fi
# Validate the branch name.
-if test "${SVN_BRANCH}" != "trunk"; then
+if test -n "${SVN_BRANCH}"; then
+ SVN_BRANCH="trunk";
+else
SVN_BRANCH="branches/${SVN_BRANCH}";
fi