1 files changed, 21 insertions, 0 deletions

diff --git a/meta/recipes-devtools/go/go-1.8/make-goroot-precious.patch b/meta/recipes-devtools/go/go-1.8/make-goroot-precious.patch
new file mode 100644
index 0000000000..28a7a34773
--- /dev/null
+++ b/meta/recipes-devtools/go/go-1.8/make-goroot-precious.patch
@@ -0,0 +1,21 @@
+Prevent GOROOT-resident packages from being rebuilt
+
+Signed-off-by: Matt Madison <matt@madison.systems>
+Upstream-Status: Pending
+
+--- go.orig/src/cmd/go/pkg.go
++++ go/src/cmd/go/pkg.go
+@@ -1496,6 +1496,13 @@ func isStale(p *Package) (bool, string)
+                return true, "build ID mismatch"
+        }
+ 
++       // For OE builds, make anything in GOROOT non-stale,
++       // to prevent a package build from overwriting the
++       // build root.
++       if p.Goroot && os.Getenv("GOROOT_OVERRIDE") != "1" {
++               return false, "GOROOT-resident packages do not get rebuilt"
++       }
++
+        // Package is stale if a dependency is.
+        for _, p1 := range p.deps {
+                if p1.Stale {