diff options
| author | Cherry Zhang <cherryyz@google.com> | 2019-10-25 13:41:36 -0400 |
|---|---|---|
| committer | Cherry Zhang <cherryyz@google.com> | 2019-10-25 13:41:36 -0400 |
| commit | d77b809df908d81406ceced91fe1b1399f1e29f1 (patch) | |
| tree | 065feecf4fe5217125d992aec9f099a39400da09 /src/cmd/dist | |
| parent | 2e2ef666b4d0bf0e86aaa3afbef7fc17f34232e6 (diff) | |
| parent | fc8eb264bba88b9e4eb85fa7560817abb25767f4 (diff) | |
| download | go-d77b809df908d81406ceced91fe1b1399f1e29f1.tar.xz | |
[dev.link] all: merge branch 'master' into dev.link
The only conflict is in cmd/internal/obj/link.go and the
resolution is trivial.
Change-Id: Ic79b760865a972a0ab68291d06386531d012de86
Diffstat (limited to 'src/cmd/dist')
| -rw-r--r-- | src/cmd/dist/build.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go index ea290b1069..6c8e558f29 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go @@ -814,7 +814,7 @@ func runInstall(dir string, ch chan struct{}) { // Define GOMIPS_value from gomips. asmArgs = append(asmArgs, "-D", "GOMIPS_"+gomips) } - if goarch == "mips64" || goarch == "mipsle64" { + if goarch == "mips64" || goarch == "mips64le" { // Define GOMIPS64_value from gomips64. asmArgs = append(asmArgs, "-D", "GOMIPS64_"+gomips64) } |