Skip to content

Commit c194f15

Browse files
authored
Fix for --preload-file + -sSTRICT (#22800)
Fixes: #20361
1 parent 2f4b17a commit c194f15

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

test/test_other.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1928,7 +1928,7 @@ def test_export_from_archive(self):
19281928
@parameterized({
19291929
'embed': (['--embed-file', 'somefile.txt'],),
19301930
'embed_twice': (['--embed-file', 'somefile.txt', '--embed-file', 'somefile.txt'],),
1931-
'preload': (['--preload-file', 'somefile.txt'],),
1931+
'preload': (['--preload-file', 'somefile.txt', '-sSTRICT'],),
19321932
'preload_closure': (['--preload-file', 'somefile.txt', '-O2', '--closure=1'],),
19331933
'preload_and_embed': (['--preload-file', 'somefile.txt', '--embed-file', 'hello.txt'],)
19341934
})

tools/link.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,6 +1206,10 @@ def phase_linker_setup(options, state, newargs):
12061206
# if we include any files, or intend to use preload plugins, then we definitely need filesystem support
12071207
settings.FORCE_FILESYSTEM = 1
12081208

1209+
if options.preload_files:
1210+
# File preloading uses `Module['preRun']`.
1211+
settings.INCOMING_MODULE_JS_API.append('preRun')
1212+
12091213
if settings.FORCE_FILESYSTEM and not settings.FILESYSTEM:
12101214
exit_with_error('`-sFORCE_FILESYSTEM` cannot be used with `-sFILESYSTEM=0`')
12111215

0 commit comments

Comments
 (0)