Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions test/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -1123,6 +1123,8 @@ def require_jspi(self):
self.set_setting('JSPI')
if self.is_wasm2js():
self.skipTest('JSPI is not currently supported for WASM2JS')
if self.get_setting('WASM_ESM_INTEGRATION'):
self.skipTest('WASM_ESM_INTEGRATION is not compatible with JSPI')

if self.is_browser_test():
if 'EMTEST_SKIP_JSPI' in os.environ:
Expand Down
4 changes: 2 additions & 2 deletions tools/link.py
Original file line number Diff line number Diff line change
Expand Up @@ -808,8 +808,8 @@ def phase_linker_setup(options, linker_args): # noqa: C901, PLR0912, PLR0915
exit_with_error('WASM_ESM_INTEGRATION requires MODULARIZE=instance')
if settings.RELOCATABLE:
exit_with_error('WASM_ESM_INTEGRATION is not compatible with dynamic linking')
if settings.ASYNCIFY == 1:
exit_with_error('WASM_ESM_INTEGRATION is not compatible with -sASYNCIFY=1')
if settings.ASYNCIFY:
exit_with_error('WASM_ESM_INTEGRATION is not compatible with -sASYNCIFY')
if settings.WASM_WORKERS or settings.PTHREADS:
exit_with_error('WASM_ESM_INTEGRATION is not compatible with multi-threading')
if settings.USE_OFFSET_CONVERTER:
Expand Down