Description: use emcc from debian, fix flags
Last-Update: 2025-04-14
Author: Israel Galadima <izzygaladima@gmail.com>, Jérémy Lal <kapouer@melix.org>
Forwarded: not-needed

--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,8 @@
 EMSDK_VERSION=3.1.35
 EMSDK_DOCKER_IMAGE=emscripten/emsdk:3.1.35
 EMCC=EMSDK_VERSION=$(EMSDK_VERSION) EMSDK_DOCKER_IMAGE=$(EMSDK_DOCKER_IMAGE) EMSDK_DOCKER_CACHE=$(THIS_DIR)/emsdk-cache/$(EMSDK_VERSION) scripts/emcc.sh
-GENERATE_TS=$(VARIANT_GENERATE_TS_ENV) npx ts-node generate.ts
+EMCC=emcc
+GENERATE_TS=$(VARIANT_GENERATE_TS_ENV) ts-node generate.ts
 PRETTIER=npx prettier
 THIS_DIR := $(dir $(abspath $(firstword $(MAKEFILE_LIST))))
 
@@ -64,7 +65,7 @@
 CFLAGS_WASM+=-s ALLOW_TABLE_GROWTH=1
 CFLAGS_WASM+=-s STACK_SIZE=5MB
 # CFLAGS_WASM+=-s MINIMAL_RUNTIME=1 # Appears to break MODULARIZE
-CFLAGS_WASM+=-s SUPPORT_ERRNO=0
+# CFLAGS_WASM+=-s SUPPORT_ERRNO=0
 
 # Emscripten options - like STRICT
 # https://github.com/emscripten-core/emscripten/blob/fa339b76424ca9fbe5cf15faea0295d2ac8d58cc/src/settings.js#L1095-L1109
@@ -96,7 +97,7 @@
 CFLAGS_RELEASE+=-flto
 
 CFLAGS_WASM_RELEASE+=-s SINGLE_FILE=1
-CFLAGS_WASM_RELEASE+=--closure 1
+# CFLAGS_WASM_RELEASE+=--closure 1
 CFLAGS_WASM_RELEASE+=-s FILESYSTEM=0
 
 # Debug options
@@ -137,8 +138,8 @@
 all: $(VARIANTS)
 dist: wasm tsconfig.json
 	rm -rf dist
-	yarn run tsc
-	cp -v ts/generated/*.wasm ts/generated/*.wasm.map dist/generated
+	tsc
+	# cp -v ts/generated/*.wasm ts/generated/*.wasm.map dist/generated
 
 .PHONY: test prettier
 test:
@@ -180,7 +181,7 @@
 # with the VARIANT= statically set so it can be used in static rule contexts.
 # I'm not good enough at Makefile to do this any other way, sorry.
 $(VARIANTS): VARIANT=$@
-$(VARIANTS): %: | emcc
+$(VARIANTS): %:
 	@$(MAKE) VARIANT=$(VARIANT) VARIANT
 
 VARIANT: $(PLATFORM)