aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-05-17 20:16:13 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-05-17 20:16:13 +0000
commit7ded3472ae5e5eec41909fcefc911e1092479f9b (patch)
tree2ba2a473fd80e8c4744b9b1352dfb3bb06f134fa /gcc
parentc8ded43049f35d69287fed9a1f25f3f283080014 (diff)
downloadgcc-7ded3472ae5e5eec41909fcefc911e1092479f9b.zip
gcc-7ded3472ae5e5eec41909fcefc911e1092479f9b.tar.gz
gcc-7ded3472ae5e5eec41909fcefc911e1092479f9b.tar.bz2
libgo: add "vendor" to pkgpath for vendored standard packages
Ensure that the packages vendored into the standard library do not have the same pkgpath as the actual packages. If we don't, attempts to build and test the actual packages will get confused. The specific error I was seeing was import loops, causing some of the packages to fail to get initialized, causing an obscure run time crash. Reviewed-on: https://go-review.googlesource.com/43610 From-SVN: r248168
Diffstat (limited to 'gcc')
-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 b1882af..f7e19d3 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-924a1fcc5658a5d66f5015921d7258e3a77519bc
+ba68a42618d1e8516e38da093d3af731d7fd4f06
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.