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
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,7 @@ jobs:
lsan.test_dlfcn_basic
lsan.test_pthread_create
lsan.test_pthread_exit_main_stub
lsan.test_dylink_iostream
ubsan.test_externref_emjs_dynlink"
- freeze-cache
- run-tests:
Expand Down
5 changes: 3 additions & 2 deletions tools/link.py
Original file line number Diff line number Diff line change
Expand Up @@ -3096,8 +3096,9 @@ def run(options, linker_args):
# This is not normally a problem except in the case of -sMAIN_MODULE=1 where
# the duplicate library would result in duplicate symbols.
for s in system_libs:
if s not in linker_args:
linker_args.append(s)
if s.startswith('-l') and s in linker_args:
continue
linker_args.append(s)

js_syms = {}
if (not settings.SIDE_MODULE or settings.ASYNCIFY) and not shared.SKIP_SUBPROCS:
Expand Down