aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Gerrand <adg@golang.org>2011-12-07 09:41:20 +1100
committerAndrew Gerrand <adg@golang.org>2011-12-07 09:41:20 +1100
commit2c7a84a95bc10fe57b7b0699aee23f06f23076b5 (patch)
tree0e66f13f907864769e0915a0529d465744fc6cb3
parentb219e8cbcf67e10b47ab6ebe97eb6497f6010000 (diff)
downloadgo-2c7a84a95bc10fe57b7b0699aee23f06f23076b5.tar.gz
go-2c7a84a95bc10fe57b7b0699aee23f06f23076b5.zip
goinstall: honour -install=false flag when -make=true
R=rsc CC=golang-dev https://golang.org/cl/5448124
-rw-r--r--src/cmd/goinstall/make.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/cmd/goinstall/make.go b/src/cmd/goinstall/make.go
index 1a52ab2e72..1e40d6ea37 100644
--- a/src/cmd/goinstall/make.go
+++ b/src/cmd/goinstall/make.go
@@ -29,7 +29,12 @@ func domake(dir, pkg string, tree *build.Tree, isCmd bool) (err error) {
} else if *clean {
cmd = append(cmd, "clean")
}
- cmd = append(cmd, "install")
+ if *doInstall {
+ cmd = append(cmd, "install")
+ }
+ if len(cmd) <= 3 { // nothing to do
+ return nil
+ }
return run(dir, makefile, cmd...)
}