From 32f64e5f996975d98286390611c627081b4eede8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 19 Nov 2019 09:44:04 +0100 Subject: [PATCH] HTML5: Explicitly link idbfs.js for IDBFS support Upstream Emscripten changed this in 1.39.1+, so IDBFS is no longer included by default and has to be linked manually. The explicit linking doesn't seem to be problematic on earlier versions (tested `1.38.47-upstream`). Fixes #33724. (cherry picked from commit e5dfcb5eddddab0ddcb698a972fb870432fc4364) --- platform/javascript/detect.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 66ea3554994..debc2294fa2 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -87,6 +87,10 @@ def configure(env): lzma_dec = "LZMA.decompress" env.Append(LINKFLAGS=['--compression', lzma_binpath + "," + lzma_decoder + "," + lzma_dec]) + # We use IDBFS in javascript_main.cpp. Since Emscripten 1.39.1 it needs to + # be linked explicitly. + env.Append(LIBS=['idbfs.js']) + env.Append(LINKFLAGS=['-s', 'ASM_JS=1']) env.Append(LINKFLAGS=['-s', 'WASM=0']) env.Append(LINKFLAGS=['-s', 'EXTRA_EXPORTED_RUNTIME_METHODS="[\'FS\']"'])