Skip to content

Commit fb0d6e4

Browse files
tklauserbradfitz
authored andcommitted
cmd/dist: remove external linking check for macOS 10.6
This was missed in CL 115236. Updates #23122 Change-Id: I5a64bd02d356c21c0e5d02dafafb3721f8dd8e06 Reviewed-on: https://go-review.googlesource.com/115276 Run-TryBot: Tobias Klauser <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Brad Fitzpatrick <[email protected]>
1 parent 85f4051 commit fb0d6e4

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

src/cmd/dist/test.go

+1-10
Original file line numberDiff line numberDiff line change
@@ -889,23 +889,14 @@ func (t *tester) extLink() bool {
889889
pair := gohostos + "-" + goarch
890890
switch pair {
891891
case "android-arm",
892-
"darwin-arm", "darwin-arm64",
892+
"darwin-386", "darwin-amd64", "darwin-arm", "darwin-arm64",
893893
"dragonfly-amd64",
894894
"freebsd-386", "freebsd-amd64", "freebsd-arm",
895895
"linux-386", "linux-amd64", "linux-arm", "linux-arm64", "linux-ppc64le", "linux-mips64", "linux-mips64le", "linux-mips", "linux-mipsle", "linux-s390x",
896896
"netbsd-386", "netbsd-amd64",
897897
"openbsd-386", "openbsd-amd64",
898898
"windows-386", "windows-amd64":
899899
return true
900-
case "darwin-386", "darwin-amd64":
901-
// linkmode=external fails on OS X 10.6 and earlier == Darwin
902-
// 10.8 and earlier.
903-
unameR, err := exec.Command("uname", "-r").Output()
904-
if err != nil {
905-
log.Fatalf("uname -r: %v", err)
906-
}
907-
major, _ := strconv.Atoi(string(unameR[:bytes.IndexByte(unameR, '.')]))
908-
return major > 10
909900
}
910901
return false
911902
}

0 commit comments

Comments
 (0)