summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch')
-rw-r--r--meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch b/meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch
index f317e48a33..29ef947abd 100644
--- a/meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch
+++ b/meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch
@@ -65,8 +65,8 @@ Index: go/src/cmd/go/internal/work/exec.go
65=================================================================== 65===================================================================
66--- go.orig/src/cmd/go/internal/work/exec.go 66--- go.orig/src/cmd/go/internal/work/exec.go
67+++ go/src/cmd/go/internal/work/exec.go 67+++ go/src/cmd/go/internal/work/exec.go
68@@ -440,6 +440,23 @@ func (b *Builder) build(a *Action) (err 68@@ -436,6 +436,23 @@ func (b *Builder) build(a *Action) (err
69 return fmt.Errorf("module requires Go %s", p.Module.GoVersion) 69 return fmt.Errorf("missing or invalid binary-only package; expected file %q", a.Package.Target)
70 } 70 }
71 71
72+ if goRootPrecious && (a.Package.Standard || a.Package.Goroot) { 72+ if goRootPrecious && (a.Package.Standard || a.Package.Goroot) {
@@ -89,7 +89,7 @@ Index: go/src/cmd/go/internal/work/exec.go
89 if err := b.Mkdir(a.Objdir); err != nil { 89 if err := b.Mkdir(a.Objdir); err != nil {
90 return err 90 return err
91 } 91 }
92@@ -1435,6 +1452,14 @@ func BuildInstallFunc(b *Builder, a *Act 92@@ -1438,6 +1455,14 @@ func BuildInstallFunc(b *Builder, a *Act
93 return nil 93 return nil
94 } 94 }
95 95