qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-19 18:14:40 -07:00
Code Releases Activity

goinstall: undo 1ad616fb313d (always rebuild...)

Browse Source 
CL 4627051 is a better way of doing the same thing.

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/4654045
This commit is contained in:
Andrew Gerrand 2011-06-21 17:13:16 +10:00
parent 524d02cbca
commit f338d9f73b
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cmd/goinstall/main.go
View File

@ -150,7 +150,7 @@ func logPackage(pkg string) {
} }
// install installs the package named by path, which is needed by parent. // install installs the package named by path, which is needed by parent.
func install(pkg, parent string) (built bool) { func install(pkg, parent string) {
// Make sure we're not already trying to install pkg. // Make sure we're not already trying to install pkg.
switch visit[pkg] { switch visit[pkg] {
case done: case done:
@ -201,12 +201,9 @@ func install(pkg, parent string) (built bool) {
errorf("%s: package has no files\n", pkg) errorf("%s: package has no files\n", pkg)
return return
} }
var depBuilt bool
for _, p := range dirInfo.Imports { for _, p := range dirInfo.Imports {
if p != "C" { if p != "C" {
if install(p, pkg) { install(p, pkg)
depBuilt = true
}
} }
} }
if errors { if errors {
@ -227,13 +224,12 @@ func install(pkg, parent string) (built bool) {
script.Clean() script.Clean()
} }
if *doInstall { if *doInstall {
if depBuilt || script.Stale() { if script.Stale() {
printf("%s: install\n", pkg) printf("%s: install\n", pkg)
if err := script.Run(); err != nil { if err := script.Run(); err != nil {
errorf("%s: install: %v\n", pkg, err) errorf("%s: install: %v\n", pkg, err)
return return
} }
built = true
} else { } else {
printf("%s: up-to-date\n", pkg) printf("%s: up-to-date\n", pkg)
} }