qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-20 09:54:45 -07:00
Code Releases Activity

cmd/go: remove Action.Objpkg

Browse Source 
This is an intermediate step toward not being able to predict
the final generated file name for a package build, so that
parent builds can refer directly to cache files.

Change-Id: I4dea5e8d8b80e6b995b3d9dc1d8c6f0ac9b88d72
Reviewed-on: https://go-review.googlesource.com/56285
Reviewed-by: David Crawshaw <crawshaw@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Russ Cox 2017-07-16 08:38:43 -06:00
parent e8fd15fd05
commit 8644463bb2
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cmd/go/internal/work/build.go
View File

@ -687,7 +687,6 @@ type Action struct {
// Generated files, directories. // Generated files, directories.
Link bool // target is executable, not just package Link bool // target is executable, not just package
Objdir string // directory for intermediate objects Objdir string // directory for intermediate objects
Objpkg string // the intermediate package .a file created during the action
Target string // goal of the action: the created package or executable Target string // goal of the action: the created package or executable
// Execution state. // Execution state.
@ -898,7 +897,6 @@ func (b *Builder) action1(mode BuildMode, depMode BuildMode, p *load.Package, lo
mode = ModeBuild mode = ModeBuild
} }
a.Objdir = b.NewObjdir() a.Objdir = b.NewObjdir()
a.Objpkg = a.Objdir + "_pkg_.a"
a.Link = p.Name == "main" && !p.Internal.ForceLibrary a.Link = p.Name == "main" && !p.Internal.ForceLibrary
switch mode { switch mode {
@ -931,7 +929,7 @@ func (b *Builder) action1(mode BuildMode, depMode BuildMode, p *load.Package, lo
case ModeBuild: case ModeBuild:
a.Func = (*Builder).build a.Func = (*Builder).build
a.Target = a.Objpkg a.Target = a.Objdir + "_pkg_.a"
a.Package.Internal.Pkgfile = a.Target a.Package.Internal.Pkgfile = a.Target
if a.Link { if a.Link {
// An executable file. (This is the name of a temporary file.) // An executable file. (This is the name of a temporary file.)
@ -1416,7 +1414,8 @@ func (b *Builder) build(a *Action) (err error) {
} }
// Compile Go. // Compile Go.
ofile, out, err := BuildToolchain.gc(b, a.Package, a.Objpkg, objdir, icfg.Bytes(), len(sfiles) > 0, gofiles) objpkg := objdir + "_pkg_.a"
ofile, out, err := BuildToolchain.gc(b, a.Package, objpkg, objdir, icfg.Bytes(), len(sfiles) > 0, gofiles)
if len(out) > 0 { if len(out) > 0 {
b.showOutput(a.Package.Dir, a.Package.ImportPath, b.processOutput(out)) b.showOutput(a.Package.Dir, a.Package.ImportPath, b.processOutput(out))
if err != nil { if err != nil {
@ -1426,7 +1425,7 @@ func (b *Builder) build(a *Action) (err error) {
if err != nil { if err != nil {
return err return err
} }
if ofile != a.Objpkg { if ofile != objpkg {
objects = append(objects, ofile) objects = append(objects, ofile)
} }
@ -1491,7 +1490,7 @@ func (b *Builder) build(a *Action) (err error) {
// If the Go compiler wrote an archive and the package is entirely // If the Go compiler wrote an archive and the package is entirely
// Go sources, there is no pack to execute at all. // Go sources, there is no pack to execute at all.
if len(objects) > 0 { if len(objects) > 0 {
if err := BuildToolchain.pack(b, a.Package, objdir, a.Objpkg, objects); err != nil { if err := BuildToolchain.pack(b, a.Package, objdir, objpkg, objects); err != nil {
return err return err
} }
} }
@ -1507,7 +1506,7 @@ func (b *Builder) build(a *Action) (err error) {
// linker needs the whole dependency tree. // linker needs the whole dependency tree.
all := ActionList(a) all := ActionList(a)
all = all[:len(all)-1] // drop a all = all[:len(all)-1] // drop a
if err := BuildToolchain.ld(b, a, a.Target, importcfg, all, a.Objpkg, objects); err != nil { if err := BuildToolchain.ld(b, a, a.Target, importcfg, all, objpkg, objects); err != nil {
return err return err
} }
} }