From: Russ Cox <rsc@golang.org>
Date: Fri, 13 Feb 2015 17:50:23 +0000 (-0500)
Subject: [dev.cc] all: merge master (5f1efe7) into dev.cc
X-Git-Tag: go1.5beta1~1915^2~69
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=87de9ce212988c8bdf0630750e772d8805091bcc;p=gostls13.git

[dev.cc] all: merge master (5f1efe7) into dev.cc

Conflicts:
	src/cmd/dist/build.go

Change-Id: I98a4b5e010bee91507b85bb8efd9c74e1a1f649c
---

87de9ce212988c8bdf0630750e772d8805091bcc
diff --cc src/cmd/dist/build.go
index 5cfc47ce84,3932c0bc42..81249d4645
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@@ -628,20 -624,13 +626,20 @@@ func install(dir string) 
  		ldargs = splitfields(defaultldflags)
  	}
  
 -	islib := strings.HasPrefix(dir, "lib") || dir == "cmd/gc" || dir == "cmd/ld"
 -	ispkg := !islib && !strings.HasPrefix(dir, "cmd/")
 -	isgo := ispkg || dir == "cmd/go" || dir == "cmd/cgo"
 +	isgo := true
 +	ispkg := !strings.HasPrefix(dir, "cmd/") || strings.HasPrefix(dir, "cmd/internal/") || strings.HasPrefix(dir, "cmd/asm/internal/")
 +	islib := false
  
 -	exe := ""
 -	if gohostos == "windows" {
 -		exe = ".exe"
 +	// Legacy C exceptions.
 +	switch dir {
- 	case "lib9", "libbio", "liblink", "cmd/gc":
++	case "lib9", "libbio", "liblink", "cmd/gc", "cmd/ld":
 +		islib = true
 +		isgo = false
 +	case "cmd/5a", "cmd/5g", "cmd/5l",
 +		"cmd/6a", "cmd/6g", "cmd/6l",
 +		"cmd/8a", "cmd/8g", "cmd/8l",
 +		"cmd/9a", "cmd/9g", "cmd/9l":
 +		isgo = false
  	}
  
  	// Start final link command line.
@@@ -911,10 -900,8 +909,10 @@@
  				compile = append(compile,
  					"-D", fmt.Sprintf("GOOS=%q", goos),
  					"-D", fmt.Sprintf("GOARCH=%q", goarch),
 +					"-D", fmt.Sprintf("GOHOSTOS=%q", gohostos),
 +					"-D", fmt.Sprintf("GOHOSTARCH=%q", gohostarch),
  					"-D", fmt.Sprintf("GOROOT=%q", goroot_final),
- 					"-D", fmt.Sprintf("GOVERSION=%q", goversion),
+ 					"-D", fmt.Sprintf("GOVERSION=%q", findgoversion()),
  					"-D", fmt.Sprintf("GOARM=%q", goarm),
  					"-D", fmt.Sprintf("GO386=%q", go386),
  					"-D", fmt.Sprintf("GO_EXTLINK_ENABLED=%q", goextlinkenabled),
diff --cc src/cmd/dist/buildruntime.go
index ff2a489b55,32064ff8f4..1f8276468e
--- a/src/cmd/dist/buildruntime.go
+++ b/src/cmd/dist/buildruntime.go
@@@ -32,31 -32,3 +32,31 @@@ func mkzversion(dir, file string) 
  
  	writefile(out, file, 0)
  }
 +
 +// mkzbootstrap writes cmd/internal/obj/zbootstrap.go:
 +//
 +//	package obj
 +//
 +//	const defaultGOROOT = <goroot>
 +//	const defaultGOARM = <goarm>
 +//	const defaultGOOS = <goos>
 +//	const defaultGOARCH = <goarch>
 +//	const version = <version>
 +//	const goexperiment = <goexperiment>
 +//
 +func mkzbootstrap(file string) {
 +	out := fmt.Sprintf(
 +		"// auto generated by go tool dist\n"+
 +			"\n"+
 +			"package obj\n"+
 +			"\n"+
 +			"const defaultGOROOT = `%s`\n"+
 +			"const defaultGOARM = `%s`\n"+
 +			"const defaultGOOS = `%s`\n"+
 +			"const defaultGOARCH = `%s`\n"+
 +			"const version = `%s`\n"+
 +			"const goexperiment = `%s`\n",
- 		goroot_final, goarm, gohostos, gohostarch, goversion, os.Getenv("GOEXPERIMENT"))
++		goroot_final, goarm, gohostos, gohostarch, findgoversion(), os.Getenv("GOEXPERIMENT"))
 +
 +	writefile(out, file, 0)
 +}