]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/dist: remove external linking check for macOS 10.6
authorTobias Klauser <tklauser@distanz.ch>
Wed, 30 May 2018 14:55:26 +0000 (16:55 +0200)
committerBrad Fitzpatrick <bradfitz@golang.org>
Wed, 30 May 2018 16:31:27 +0000 (16:31 +0000)
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>
src/cmd/dist/test.go

index 5bd5b424afbd6a291152f921012a1f46293f9ea0..a1c470cc97cc5562e3598647b52a2fb0accc84e9 100644 (file)
@@ -889,7 +889,7 @@ func (t *tester) extLink() bool {
        pair := gohostos + "-" + goarch
        switch pair {
        case "android-arm",
-               "darwin-arm", "darwin-arm64",
+               "darwin-386", "darwin-amd64", "darwin-arm", "darwin-arm64",
                "dragonfly-amd64",
                "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",
@@ -897,15 +897,6 @@ func (t *tester) extLink() bool {
                "openbsd-386", "openbsd-amd64",
                "windows-386", "windows-amd64":
                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
 }