]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/link: fix defaultGOROOT package
authorAustin Clements <austin@google.com>
Fri, 16 Apr 2021 20:46:33 +0000 (16:46 -0400)
committerAustin Clements <austin@google.com>
Fri, 16 Apr 2021 21:48:46 +0000 (21:48 +0000)
CL 310731 moved cmd/internal/objabi.defaultGOROOT to
internal/buildcfg.defaultGOROOT, but didn't update the place in the
linker that sets its value.

Fixes the failing reboot test on the GOEXPERIMENT builders.

Change-Id: I135b6bfc0fdadbe6cfc144d7aa55ca13519ba004
Reviewed-on: https://go-review.googlesource.com/c/go/+/310869
Trust: Austin Clements <austin@google.com>
Run-TryBot: Austin Clements <austin@google.com>
Reviewed-by: Jay Conrod <jayconrod@google.com>
TryBot-Result: Go Bot <gobot@golang.org>

src/cmd/link/internal/ld/main.go

index 7ab9ca7d10c898952d8cd53926ee526cd6e8b204..52dfe91993fcb902dc259a3233fd91e5684df03e 100644 (file)
@@ -117,7 +117,7 @@ func Main(arch *sys.Arch, theArch Arch) {
 
        final := gorootFinal()
        addstrdata1(ctxt, "runtime.defaultGOROOT="+final)
-       addstrdata1(ctxt, "cmd/internal/objabi.defaultGOROOT="+final)
+       addstrdata1(ctxt, "internal/buildcfg.defaultGOROOT="+final)
 
        buildVersion := buildcfg.Version
        if goexperiment := buildcfg.GOEXPERIMENT(); goexperiment != "" {