Skip to content

Commit f87bd74

Browse files
committed
Mark linker options for dynamic linking unsupported with -s USE_PTHREADS=1 (todo for later).
1 parent 80c8aae commit f87bd74

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

emcc

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,9 +1008,19 @@ try:
10081008
else:
10091009
js_libraries.append(shared.path_from_root('src', 'library_pthread_stub.js'))
10101010

1011-
if shared.Settings.USE_PTHREADS and shared.Settings.PROXY_TO_WORKER:
1012-
logging.error('-s PROXY_TO_WORKER=1 is not yet supported with -s USE_PTHREADS=1!')
1013-
exit(1)
1011+
if shared.Settings.USE_PTHREADS:
1012+
if shared.Settings.PROXY_TO_WORKER:
1013+
logging.error('-s PROXY_TO_WORKER=1 is not yet supported with -s USE_PTHREADS=1!')
1014+
exit(1)
1015+
if shared.Settings.LINKABLE:
1016+
logging.error('-s LINKABLE=1 is not supported with -s USE_PTHREADS=1!')
1017+
exit(1)
1018+
if shared.Settings.SIDE_MODULE:
1019+
logging.error('-s SIDE_MODULE=1 is not supported with -s USE_PTHREADS=1!')
1020+
exit(1)
1021+
if shared.Settings.MAIN_MODULE:
1022+
logging.error('-s MAIN_MODULE=1 is not supported with -s USE_PTHREADS=1!')
1023+
exit(1)
10141024

10151025
shared.Settings.EMSCRIPTEN_VERSION = shared.EMSCRIPTEN_VERSION
10161026
shared.Settings.OPT_LEVEL = opt_level

0 commit comments

Comments
 (0)