@@ -2,15 +2,16 @@ GO ?= go
22
33SRC_DIR := src
44DST_DIR := pub
5- WASM_EXEC := $(shell tinygo env TINYGOROOT) /targets/wasm_exec.js
6- # WASM_EXEC := $(shell go env GOROOT)/misc/wasm/wasm_exec.js
5+
6+ # explicitly build the playground with _vendor/tinygo until
7+ # https://github.com/tinygo-org/tinygo/issues/4873 fixed.
78
89playground : $(DST_DIR ) /play.wasm $(DST_DIR ) /index.html $(DST_DIR ) /wasm_exec.js $(DST_DIR ) /play.css
910
1011ROOT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST ) ) ) )
11- $(DST_DIR ) /play.wasm : $(SRC_DIR ) /main.go
12+ $(DST_DIR ) /play.wasm : $(SRC_DIR ) /main.go _vendor/tinygo/bin/tinygo
1213 @mkdir -p $(@D )
13- GOOS=js GOARCH=wasm tinygo build -no-debug -size short -o $@ $<
14+ GOOS=js GOARCH=wasm ./_vendor/tinygo/bin/ tinygo build -no-debug -size short -o $@ $<
1415# cd $(SRC_DIR); GOOS=js GOARCH=wasm go build -o $(ROOT_DIR)/$@ $$(basename "$<")
1516
1617$(DST_DIR ) /play.css : $(SRC_DIR ) /play.css
@@ -21,15 +22,12 @@ $(DST_DIR)/index.html: $(SRC_DIR)/index.html
2122 mkdir -p $(@D )
2223 version=$$(grep jsonpath go.mod | awk '{print $$3}' ) ; cat $< | sed -e " s!{{version}}!$$ {version}!g" > $@
2324
24- $(DST_DIR ) /wasm_exec.js : $( WASM_EXEC )
25+ $(DST_DIR ) /wasm_exec.js : _vendor/tinygo/bin/tinygo
2526 mkdir -p $(@D )
26- cp $< $@
27+ cp $( shell ./_vendor/tinygo/bin/tinygo env TINYGOROOT) /targets/wasm_exec.js $@
2728
28- # explicitly build the playground with _vendor/tinygo until
29- # https://github.com/tinygo-org/tinygo/issues/4873 fixed.
3029.PHONY : run
31- run : _vendor/tinygo
32- env PATH=" $$ PWD/_vendor/tinygo/bin:$$ PATH" $(MAKE ) playground
30+ run : playground
3331 python3 -m http.server --directory $(DST_DIR )
3432
3533.PHONY : brew-lint-depends # Install linting tools from Homebrew
@@ -57,11 +55,7 @@ golangci-lint: .golangci.yaml
5755clean :
5856 rm -rf $(DST_DIR )
5957
60- _vendor/tinygo : _vendor/tinygo0.36.0
61- cd _vendor && ln -sF tinygo0.36.0 tinygo
62-
63- _vendor/tinygo0.36.0 :
58+ _vendor/tinygo/bin/tinygo :
6459 brew install binaryen
6560 mkdir -p _vendor
66- curl -L https://github.com/tinygo-org/tinygo/releases/download/v0.36.0/tinygo0.36.0.darwin-arm64.tar.gz | tar zxf -
67- mv tinygo $@
61+ cd _vendor && curl -L https://github.com/tinygo-org/tinygo/releases/download/v0.40.1/tinygo0.40.1.darwin-arm64.tar.gz | tar zxf -
0 commit comments