From aa443150c83535fedccb3dee80daa7e01fafd92d Mon Sep 17 00:00:00 2001
From: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 17 May 2017 20:16:42 +0000
Subject: [PATCH]     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


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@248169 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libgo/Makefile.am | 2 +-
 libgo/Makefile.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index 515b61b71e4d..471d53baf428 100644
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -920,7 +920,7 @@ BUILDDEPS = \
 BUILDPACKAGE = \
 	$(MKDIR_P) $(@D); \
 	files=`echo $^ | sed -e 's/[^ ]*\.gox//g' -e 's/[^ ]*\.dep//'`; \
-	$(LTGOCOMPILE) -I . -c -fgo-pkgpath=`echo $@ | sed -e 's/.lo$$//'` $($(subst -,_,$(subst .,_,$(subst /,_,$@)))_GOCFLAGS) -o $@ $$files
+	$(LTGOCOMPILE) -I . -c -fgo-pkgpath=`echo $@ | sed -e 's/.lo$$//' -e 's|golang_org|vendor/golang_org|'` $($(subst -,_,$(subst .,_,$(subst /,_,$@)))_GOCFLAGS) -o $@ $$files
 
 # How to build a .gox file from a .lo file.
 BUILDGOX = \
diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index d6e3eace40ce..400fab66e9ae 100644
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -1075,7 +1075,7 @@ BUILDDEPS = \
 BUILDPACKAGE = \
 	$(MKDIR_P) $(@D); \
 	files=`echo $^ | sed -e 's/[^ ]*\.gox//g' -e 's/[^ ]*\.dep//'`; \
-	$(LTGOCOMPILE) -I . -c -fgo-pkgpath=`echo $@ | sed -e 's/.lo$$//'` $($(subst -,_,$(subst .,_,$(subst /,_,$@)))_GOCFLAGS) -o $@ $$files
+	$(LTGOCOMPILE) -I . -c -fgo-pkgpath=`echo $@ | sed -e 's/.lo$$//' -e 's|golang_org|vendor/golang_org|'` $($(subst -,_,$(subst .,_,$(subst /,_,$@)))_GOCFLAGS) -o $@ $$files
 
 
 # How to build a .gox file from a .lo file.