From: Andrew Gerrand <adg@golang.org>
Date: Tue, 6 Dec 2011 22:41:20 +0000 (+1100)
Subject: goinstall: honour -install=false flag when -make=true
X-Git-Tag: weekly.2011-12-06~6
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=2c7a84a95bc10fe57b7b0699aee23f06f23076b5;p=gostls13.git

goinstall: honour -install=false flag when -make=true

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

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...)
 }