forked from pool/go1.14
Jeff Kowalczyk
2a14b8a428
- go1.14rc1 (released 2020/02/05) is a release candidate version of Go 1.14. It is cut from release-branch.go1.14 at the revision tagged go1.14rc1. go1.14rc1 is packaged before stable release of go1.14 to provide a preview of new default behavior for go modules. This early access is primarily intended to test use in offline OBS environment use with upstream go proxy infrastructure. * packaging: drop patch gcc9-rsp-clobber.patch now merged in go1.14 * packaging: update version of LLVM compiler-rt * packaging: update _service definitions * packaging: update %doc entries rm devel/ add modules.md * doc: rename HTML element IDs to avoid duplicates * net: don't check LookupHost error in TestLookupNullByte * runtime: don't treat SIGURG as a bad signal * internal/bytealg: fix riscv64 offset names * doc: remove paragraph break for upgrading to modules * syscall: Revert "release a js.Func object in fsCall" * doc/go1.14: note that all changes to the standard library are minor * doc/go1.14: fix broken links * doc/go1.14: remove TODO about Solaris port OBS-URL: https://build.opensuse.org/request/show/774640 OBS-URL: https://build.opensuse.org/package/show/devel:languages:go/go1.14?expand=0&rev=1
20 lines
787 B
Diff
20 lines
787 B
Diff
Index: go/src/cmd/go/internal/load/pkg.go
|
|
===================================================================
|
|
--- go.orig/src/cmd/go/internal/load/pkg.go
|
|
+++ go/src/cmd/go/internal/load/pkg.go
|
|
@@ -1281,7 +1281,13 @@ func (p *Package) load(stk *ImportStack,
|
|
if cfg.BuildToolchainName == "gccgo" {
|
|
p.Target = filepath.Join(base.ToolDir, elem)
|
|
} else {
|
|
- p.Target = filepath.Join(cfg.GOROOTpkg, "tool", full)
|
|
+ // If GOROOT_TARGET is set, then write to it for packaging purpose
|
|
+ gorootTarget := os.Getenv("GOROOT_TARGET")
|
|
+ if gorootTarget == "" {
|
|
+ p.Target = filepath.Join(cfg.GOROOTpkg, "tool", full)
|
|
+ } else {
|
|
+ p.Target = filepath.Join(gorootTarget, "pkg/tool", full)
|
|
+ }
|
|
}
|
|
}
|
|
if p.Target != "" && cfg.BuildContext.GOOS == "windows" {
|