aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAgniva De Sarker <agnivade@yahoo.co.in>2018-06-23 11:25:31 +0530
committerBrad Fitzpatrick <bradfitz@golang.org>2018-07-03 17:37:40 +0000
commit5d4f0474ecb322135612813eadf22db78309b33f (patch)
treec46bfe20e01510f9159abc8b5638f14552716ee1 /src
parentaad71d3163fdeccd9c04ebf326efd58eef3307d9 (diff)
downloadgo-5d4f0474ecb322135612813eadf22db78309b33f.tar.xz
cmd/dist: skip building tools for js/wasm
Fixes #25911 Change-Id: Id3b5ea5494544e9e7f889831cefaf080cae8865d Reviewed-on: https://go-review.googlesource.com/120655 Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org> Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src')
-rw-r--r--src/cmd/dist/build.go11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
index 616e76dfe7..2fdc4d3143 100644
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@ -1302,9 +1302,14 @@ func cmdbootstrap() {
os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch))
xprintf("Building packages and commands for target, %s/%s.\n", goos, goarch)
}
- goInstall(goBootstrap, "std", "cmd")
- checkNotStale(goBootstrap, "std", "cmd")
- checkNotStale(cmdGo, "std", "cmd")
+ targets := []string{"std", "cmd"}
+ if goos == "js" && goarch == "wasm" {
+ // Skip the cmd tools for js/wasm. They're not usable.
+ targets = targets[:1]
+ }
+ goInstall(goBootstrap, targets...)
+ checkNotStale(goBootstrap, targets...)
+ checkNotStale(cmdGo, targets...)
if debug {
run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full")
run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch))