1 files changed, 11 insertions, 11 deletions

diff --git a/meta/recipes-devtools/go/go/0006-cmd-go-make-GOROOT-precious-by-default.patch b/meta/recipes-devtools/go/go/0006-cmd-go-make-GOROOT-precious-by-default.patch
index d118e726c6..262f1e96b8 100644
--- a/meta/recipes-devtools/go/go/0006-cmd-go-make-GOROOT-precious-by-default.patch
+++ b/meta/recipes-devtools/go/go/0006-cmd-go-make-GOROOT-precious-by-default.patch
@@ -29,10 +29,10 @@ Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
  3 files changed, 34 insertions(+)
 
 diff --git a/src/cmd/go/internal/work/action.go b/src/cmd/go/internal/work/action.go
-index d4d0a71..42149d2 100644
+index a59072e591..9e35ebde0c 100644
 --- a/src/cmd/go/internal/work/action.go
 +++ b/src/cmd/go/internal/work/action.go
-@@ -730,6 +730,9 @@ func (b *Builder) addTransitiveLinkDeps(a, a1 *Action, shlib string) {
+@@ -754,6 +754,9 @@ func (b *Builder) addTransitiveLinkDeps(a, a1 *Action, shlib string) {
                         if p1 == nil || p1.Shlib == "" || haveShlib[filepath.Base(p1.Shlib)] {
                                 continue
                         }
@@ -43,10 +43,10 @@ index d4d0a71..42149d2 100644
                         // TODO(rsc): The use of ModeInstall here is suspect, but if we only do ModeBuild,
                         // we'll end up building an overall library or executable that depends at runtime
 diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go
-index e2e0e07..1c84137 100644
+index 408edb5119..3d60252127 100644
 --- a/src/cmd/go/internal/work/build.go
 +++ b/src/cmd/go/internal/work/build.go
-@@ -228,6 +228,8 @@ See also: go install, go get, go clean.
+@@ -233,6 +233,8 @@ See also: go install, go get, go clean.
  
  const concurrentGCBackendCompilationEnabledByDefault = true
  
@@ -55,7 +55,7 @@ index e2e0e07..1c84137 100644
  func init() {
         // break init cycle
         CmdBuild.Run = runBuild
-@@ -241,6 +243,10 @@ func init() {
+@@ -246,6 +248,10 @@ func init() {
                 AddCoverFlags(CmdBuild, nil)
                 AddCoverFlags(CmdInstall, nil)
         }
@@ -67,10 +67,10 @@ index e2e0e07..1c84137 100644
  
  // Note that flags consulted by other parts of the code
 diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go
-index e3dd486..0ea5316 100644
+index 9724cd07d0..544df461a2 100644
 --- a/src/cmd/go/internal/work/exec.go
 +++ b/src/cmd/go/internal/work/exec.go
-@@ -539,6 +539,23 @@ func (b *Builder) build(ctx context.Context, a *Action) (err error) {
+@@ -544,6 +544,23 @@ func (b *Builder) build(ctx context.Context, a *Action) (err error) {
                 return err
         }
  
@@ -91,10 +91,10 @@ index e3dd486..0ea5316 100644
 +               }
 +       }
 +
-        if err := b.Mkdir(a.Objdir); err != nil {
+        if err := sh.Mkdir(a.Objdir); err != nil {
                 return err
         }
-@@ -1722,6 +1739,14 @@ func (b *Builder) linkShared(ctx context.Context, a *Action) (err error) {
+@@ -1737,6 +1754,14 @@ func (b *Builder) linkShared(ctx context.Context, a *Action) (err error) {
                 return err
         }
  
@@ -106,9 +106,9 @@ index e3dd486..0ea5316 100644
 +               }
 +       }
 +
-        if err := b.Mkdir(a.Objdir); err != nil {
+        if err := b.Shell(a).Mkdir(a.Objdir); err != nil {
                 return err
         }
 -- 
-2.43.0
+2.44.0