Skip to content

Fix for --preload-file + -sSTRICT #22800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbc100 merged 1 commit into from
Oct 29, 2024
Merged

Fix for --preload-file + -sSTRICT #22800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/test_other.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1928,7 +1928,7 @@ def test_export_from_archive(self):
@parameterized({
'embed': (['--embed-file', 'somefile.txt'],),
'embed_twice': (['--embed-file', 'somefile.txt', '--embed-file', 'somefile.txt'],),
'preload': (['--preload-file', 'somefile.txt'],),
'preload': (['--preload-file', 'somefile.txt', '-sSTRICT'],),
'preload_closure': (['--preload-file', 'somefile.txt', '-O2', '--closure=1'],),
'preload_and_embed': (['--preload-file', 'somefile.txt', '--embed-file', 'hello.txt'],)
})
Expand Down
4 changes: 4 additions & 0 deletions tools/link.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,6 +1206,10 @@ def phase_linker_setup(options, state, newargs):
# if we include any files, or intend to use preload plugins, then we definitely need filesystem support
settings.FORCE_FILESYSTEM = 1

if options.preload_files:
# File preloading uses `Module['preRun']`.
settings.INCOMING_MODULE_JS_API.append('preRun')

if settings.FORCE_FILESYSTEM and not settings.FILESYSTEM:
exit_with_error('`-sFORCE_FILESYSTEM` cannot be used with `-sFILESYSTEM=0`')

Expand Down
Loading