Skip to content

Commit a90c5ab

Browse files
authored
Fix ubsan.test_fs_no_main_minimal_runtime (#19118)
This test was broken by #19097
1 parent 005489c commit a90c5ab

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

emcc.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2645,8 +2645,10 @@ def check_memory_setting(setting):
26452645
if settings.PTHREADS:
26462646
settings.INITIAL_MEMORY += 50 * 1024 * 1024
26472647

2648-
if settings.USE_OFFSET_CONVERTER and settings.WASM2JS:
2649-
exit_with_error('wasm2js is not compatible with USE_OFFSET_CONVERTER (see #14630)')
2648+
if settings.USE_OFFSET_CONVERTER:
2649+
if settings.WASM2JS:
2650+
exit_with_error('wasm2js is not compatible with USE_OFFSET_CONVERTER (see #14630)')
2651+
settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE.append('$UTF8ArrayToString')
26502652

26512653
if sanitize & UBSAN_SANITIZERS:
26522654
if '-fsanitize-minimal-runtime' in newargs:

0 commit comments

Comments
 (0)