build: update wasm tooling versions

Author: kgryte

tools/make/common.mk

@@ -494,7 +494,7 @@ endif
 DEPS_EMSDK_BUILD_OUT ?= $(DEPS_BUILD_DIR)/emsdk
 
 # Define the Emscripten SDK version:
-DEPS_EMSDK_VERSION ?= incoming
+DEPS_EMSDK_VERSION ?= latest
 
 # Define the path to Emscripten:
 DEPS_EMSDK_EMSCRIPTEN ?= $(DEPS_EMSDK_BUILD_OUT)/emscripten/$(DEPS_EMSDK_VERSION)
@@ -506,7 +506,7 @@ DEPS_EMSDK_EMSCRIPTEN_EMCC ?= $(DEPS_EMSDK_EMSCRIPTEN)/emcc
 DEPS_EMSDK_EMSCRIPTEN_EMXX ?= $(DEPS_EMSDK_EMSCRIPTEN)/em++
 
 # Define the Binaryen version:
-DEPS_EMSDK_BINARYEN_VERSION ?= master
+DEPS_EMSDK_BINARYEN_VERSION ?= main
 
 # Define the output path when building the WebAssembly Binary Toolkit (WABT):
 DEPS_WABT_BUILD_OUT ?= $(DEPS_BUILD_DIR)/wabt

tools/make/lib/install/emsdk.mk

@@ -68,10 +68,10 @@ deps_emsdk := sdk-$(DEPS_EMSDK_VERSION)-64bit
 deps_emsdk_binaryen := binaryen-$(DEPS_EMSDK_BINARYEN_VERSION)-64bit
 
 # Define the path to the `emcc` compiler:
-EMCC ?= $(DEPS_EMSDK_BUILD_OUT)/emscripten/$(DEPS_EMSDK_VERSION)/emcc
+EMCC ?= $(DEPS_EMSDK_BUILD_OUT)/upstream/emscripten/emcc
 
 # Define the path to an executable for running HTML pages:
-EMRUN ?= $(DEPS_EMSDK_BUILD_OUT)/emscripten/$(DEPS_EMSDK_VERSION)/emrun
+EMRUN ?= $(DEPS_EMSDK_BUILD_OUT)/upstream/emscripten/emrun
 
 
 # RULES #