qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-18 01:24:49 -07:00
Code Releases Activity

cmd/dist: remove external linking check for macOS 10.6

Browse Source 
This was missed in CL 115236.

Updates #23122

Change-Id: I5a64bd02d356c21c0e5d02dafafb3721f8dd8e06
Reviewed-on: https://go-review.googlesource.com/115276
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Tobias Klauser 2018-05-30 16:55:26 +02:00 committed by Brad Fitzpatrick
parent 85f4051731
commit fb0d6e4bd1
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -889,7 +889,7 @@ func (t *tester) extLink() bool {
pair := gohostos + "-" + goarch pair := gohostos + "-" + goarch
switch pair { switch pair {
case "android-arm", case "android-arm",
"darwin-arm", "darwin-arm64", "darwin-386", "darwin-amd64", "darwin-arm", "darwin-arm64",
"dragonfly-amd64", "dragonfly-amd64",
"freebsd-386", "freebsd-amd64", "freebsd-arm", "freebsd-386", "freebsd-amd64", "freebsd-arm",
"linux-386", "linux-amd64", "linux-arm", "linux-arm64", "linux-ppc64le", "linux-mips64", "linux-mips64le", "linux-mips", "linux-mipsle", "linux-s390x", "linux-386", "linux-amd64", "linux-arm", "linux-arm64", "linux-ppc64le", "linux-mips64", "linux-mips64le", "linux-mips", "linux-mipsle", "linux-s390x",
@ -897,15 +897,6 @@ func (t *tester) extLink() bool {
"openbsd-386", "openbsd-amd64", "openbsd-386", "openbsd-amd64",
"windows-386", "windows-amd64": "windows-386", "windows-amd64":
return true return true
case "darwin-386", "darwin-amd64":
// linkmode=external fails on OS X 10.6 and earlier == Darwin
// 10.8 and earlier.
unameR, err := exec.Command("uname", "-r").Output()
if err != nil {
log.Fatalf("uname -r: %v", err)
}
major, _ := strconv.Atoi(string(unameR[:bytes.IndexByte(unameR, '.')]))
return major > 10
} }
return false return false
} }