From: Andrew Gerrand <adg@golang.org>
Date: Thu, 23 Jun 2011 00:15:46 +0000 (+1000)
Subject: go/build: include Import objects in Script Inputs
X-Git-Tag: weekly.2011-06-23~11
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=d7df79a7e53e14c00f07d6ceae79245ef348d1fc;p=gostls13.git

go/build: include Import objects in Script Inputs

This has the effect of making goinstall rebuild a package's
dependencies when they are newer than the current package object.

R=rsc
CC=golang-dev
https://golang.org/cl/4627051
---

diff --git a/src/pkg/go/build/build.go b/src/pkg/go/build/build.go
index 585489279f..d83a6666e8 100644
--- a/src/pkg/go/build/build.go
+++ b/src/pkg/go/build/build.go
@@ -35,6 +35,18 @@ func Build(tree *Tree, pkg string, info *DirInfo) (*Script, os.Error) {
 		return nil, err
 	}
 
+	// add import object files to list of Inputs
+	for _, pkg := range info.Imports {
+		t, p, err := FindTree(pkg)
+		if err != nil && err != ErrNotFound {
+			// FindTree should always be able to suggest an import
+			// path and tree. The path must be malformed
+			// (for example, an absolute or relative path).
+			return nil, os.NewError("build: invalid import: " + pkg)
+		}
+		s.addInput(filepath.Join(t.PkgDir(), p+".a"))
+	}
+
 	// .go files to be built with gc
 	gofiles := b.abss(info.GoFiles...)
 	s.addInput(gofiles...)