From b05903a9f6408065c390ea6c62e523d9f51853a5 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Fri, 16 Apr 2021 16:46:33 -0400 Subject: [PATCH] cmd/link: fix defaultGOROOT package 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 Run-TryBot: Austin Clements Reviewed-by: Jay Conrod TryBot-Result: Go Bot --- src/cmd/link/internal/ld/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/link/internal/ld/main.go b/src/cmd/link/internal/ld/main.go index 7ab9ca7d10c..52dfe91993f 100644 --- a/src/cmd/link/internal/ld/main.go +++ b/src/cmd/link/internal/ld/main.go @@ -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 != "" {