]> Cypherpunks repositories - gostls13.git/commitdiff
goinstall: undo 1ad616fb313d (always rebuild...)
authorAndrew Gerrand <adg@golang.org>
Tue, 21 Jun 2011 07:13:16 +0000 (17:13 +1000)
committerAndrew Gerrand <adg@golang.org>
Tue, 21 Jun 2011 07:13:16 +0000 (17:13 +1000)
CL 4627051 is a better way of doing the same thing.

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/4654045

src/cmd/goinstall/main.go

index aad3ca863537579b6a2bd9f2e3c73682cc14fc34..64fae08688f7646d3326e7c27d623a9973de3e53 100644 (file)
@@ -150,7 +150,7 @@ func logPackage(pkg string) {
 }
 
 // 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.
        switch visit[pkg] {
        case done:
@@ -201,12 +201,9 @@ func install(pkg, parent string) (built bool) {
                errorf("%s: package has no files\n", pkg)
                return
        }
-       var depBuilt bool
        for _, p := range dirInfo.Imports {
                if p != "C" {
-                       if install(p, pkg) {
-                               depBuilt = true
-                       }
+                       install(p, pkg)
                }
        }
        if errors {
@@ -227,13 +224,12 @@ func install(pkg, parent string) (built bool) {
                script.Clean()
        }
        if *doInstall {
-               if depBuilt || script.Stale() {
+               if script.Stale() {
                        printf("%s: install\n", pkg)
                        if err := script.Run(); err != nil {
                                errorf("%s: install: %v\n", pkg, err)
                                return
                        }
-                       built = true
                } else {
                        printf("%s: up-to-date\n", pkg)
                }