This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [patch] Fix gcc_build
On Monday 31 October 2005 06:10, David Edelsohn wrote:
> This broke building GCC.
>
> +# The branch to check out from that server.
> +SVN_BRANCH="trunk"
> ...
> +if [ ${CHECKOUT} -eq 0 ] && test -n "${SVN_BRANCH}"; then
> + error "Branch argument only makes sense when doing a checkout"
> +fi
>
> Your change always defines SVN_BRANCH, but then tests if it exists when
> the user did not request a checkout.
Uh, right... Sorry 'bout that.
Does this fix look good to you?
Gr.
Steven
Index: gcc_build
===================================================================
--- gcc_build (revision 106278)
+++ gcc_build (working copy)
@@ -201,7 +201,8 @@
# 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 @@
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