From 35d22afb4b8e4f2c0ce06150727dc91a5c54378e Mon Sep 17 00:00:00 2001 From: Matthew Dempsky Date: Tue, 20 Sep 2016 18:12:27 -0700 Subject: [PATCH] cmd/internal/obj: remove unused GOROOT-related fields Change-Id: I6634f70d6bd1a4eced47eda69a2d9b207d222a1b Reviewed-on: https://go-review.googlesource.com/29470 Run-TryBot: Matthew Dempsky TryBot-Result: Gobot Gobot Reviewed-by: David Crawshaw --- src/cmd/internal/obj/link.go | 2 -- src/cmd/internal/obj/obj.go | 1 - src/cmd/internal/obj/sym.go | 3 --- 3 files changed, 6 deletions(-) diff --git a/src/cmd/internal/obj/link.go b/src/cmd/internal/obj/link.go index 3b51390a58..e9b020c561 100644 --- a/src/cmd/internal/obj/link.go +++ b/src/cmd/internal/obj/link.go @@ -673,8 +673,6 @@ type Link struct { Flag_optimize bool Bso *bufio.Writer Pathname string - Goroot string - Goroot_final string Hash map[SymVer]*LSym LineHist LineHist Imports []string diff --git a/src/cmd/internal/obj/obj.go b/src/cmd/internal/obj/obj.go index 3eb37b3bbc..566263d3d7 100644 --- a/src/cmd/internal/obj/obj.go +++ b/src/cmd/internal/obj/obj.go @@ -31,7 +31,6 @@ type LineHist struct { TrimPathPrefix string // remove leading TrimPath from recorded file names PrintFilenameOnly bool // ignore path when pretty-printing a line; internal use only GOROOT string // current GOROOT - GOROOT_FINAL string // target GOROOT } // A LineStack is an entry in the recorded line history. diff --git a/src/cmd/internal/obj/sym.go b/src/cmd/internal/obj/sym.go index c2ddf6b283..84de5b61c4 100644 --- a/src/cmd/internal/obj/sym.go +++ b/src/cmd/internal/obj/sym.go @@ -42,8 +42,6 @@ func Linknew(arch *LinkArch) *Link { ctxt.Hash = make(map[SymVer]*LSym) ctxt.Arch = arch ctxt.Version = HistVersion - ctxt.Goroot = GOROOT - ctxt.Goroot_final = os.Getenv("GOROOT_FINAL") var buf string buf, _ = os.Getwd() @@ -54,7 +52,6 @@ func Linknew(arch *LinkArch) *Link { ctxt.Pathname = buf ctxt.LineHist.GOROOT = GOROOT - ctxt.LineHist.GOROOT_FINAL = ctxt.Goroot_final ctxt.LineHist.Dir = ctxt.Pathname ctxt.Headtype.Set(GOOS) -- 2.48.1