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

cmd/dist: enable external linking test for windows/amd64

Browse Source 
Fixes #4069.

Change-Id: I2d2ea233f976aab3f356f9b508cdd246d5013e31
Signed-off-by: Shenghou Ma <minux@golang.org>
Reviewed-on: https://go-review.googlesource.com/7535
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Alex Brainman <alex.brainman@gmail.com>
This commit is contained in:
Shenghou Ma 2015-03-13 22:12:09 -04:00 committed by Minux Ma
parent e7df053977
commit 4d59d1fcb1
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cmd/dist/test.go vendored
View File

@ -351,7 +351,7 @@ func (t *tester) extLink() bool {
"linux-386", "linux-amd64", "linux-arm", "linux-386", "linux-amd64", "linux-arm",
"netbsd-386", "netbsd-amd64", "netbsd-386", "netbsd-amd64",
"openbsd-386", "openbsd-amd64", "openbsd-386", "openbsd-amd64",
"windows-386": "windows-386", "windows-amd64":
return true return true
case "darwin-386", "darwin-amd64": case "darwin-386", "darwin-amd64":
// linkmode=external fails on OS X 10.6 and earlier == Darwin // linkmode=external fails on OS X 10.6 and earlier == Darwin
@ -370,10 +370,7 @@ func (t *tester) cgoTest() error {
env := mergeEnvLists([]string{"GOTRACEBACK=2"}, os.Environ()) env := mergeEnvLists([]string{"GOTRACEBACK=2"}, os.Environ())
iOS := t.goos == "darwin" && (t.goarch == "arm" || t.goarch == "arm64") iOS := t.goos == "darwin" && (t.goarch == "arm" || t.goarch == "arm64")
switch { if t.goos == "android" || iOS {
case t.goos == "windows" && t.goarch != "386":
fallthrough
case t.goos == "android", iOS:
cmd := t.dirCmd("misc/cgo/test", "go", "test") cmd := t.dirCmd("misc/cgo/test", "go", "test")
cmd.Env = env cmd.Env = env
return cmd.Run() return cmd.Run()
@ -398,7 +395,7 @@ func (t *tester) cgoTest() error {
return err return err
} }
case "darwin-386", "darwin-amd64", case "darwin-386", "darwin-amd64",
"windows-386": "windows-386", "windows-amd64":
if t.extLink() { if t.extLink() {
cmd := t.dirCmd("misc/cgo/test", "go", "test", "-ldflags", "-linkmode=external") cmd := t.dirCmd("misc/cgo/test", "go", "test", "-ldflags", "-linkmode=external")
cmd.Env = env cmd.Env = env