aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2015-11-04 01:52:40 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2015-11-04 01:52:40 +0000
commitaa3ba34fbacc59cd7cec4686244baa8cec85fa33 (patch)
tree3222b0ded296a9a9a6df3508a605090e336830f1 /gcc/go
parentbfd4a4de7dbcda2382aee83752b4ddd2d11bb44c (diff)
downloadgcc-aa3ba34fbacc59cd7cec4686244baa8cec85fa33.zip
gcc-aa3ba34fbacc59cd7cec4686244baa8cec85fa33.tar.gz
gcc-aa3ba34fbacc59cd7cec4686244baa8cec85fa33.tar.bz2
gotest: fix handling of --goarch option
I managed to add a new --goarch option to gotest without noticing that the script already had one. Worse, they set different variables. Remove the old option in favor of the new one. Reviewed-on: https://go-review.googlesource.com/16613 From-SVN: r229734
Diffstat (limited to 'gcc/go')
-rw-r--r--gcc/go/gofrontend/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 23b53be..dc042d9 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-10e0f935ac369f8403c198b05c909e42e565c1e5
+47f256e1ed527b2eb4041acf90d33e6abc5e1685
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.