Skip to content

Commit c0e1a98

Browse files
authored
Minor refactor of process_libraries. NFC (#14384)
Preparation for #14337.
1 parent a28eb98 commit c0e1a98

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

emcc.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,7 @@ def run(args):
10501050
if state.mode == Mode.POST_LINK_ONLY:
10511051
settings.limit_settings(None)
10521052
target, wasm_target = phase_linker_setup(options, state, newargs, settings_map)
1053-
process_libraries(state.link_flags, state.lib_dirs, [])
1053+
process_libraries(state, [])
10541054
if len(input_files) != 1:
10551055
exit_with_error('--post-link requires a single input file')
10561056
phase_post_link(options, state, input_files[0][1], wasm_target, target)
@@ -1113,7 +1113,7 @@ def phase_calculate_linker_inputs(options, state, linker_inputs):
11131113
state.link_flags = filter_link_flags(state.link_flags, using_lld)
11141114

11151115
# Decide what we will link
1116-
state.link_flags = process_libraries(state.link_flags, state.lib_dirs, linker_inputs)
1116+
process_libraries(state, linker_inputs)
11171117

11181118
linker_args = [val for _, val in sorted(linker_inputs + state.link_flags)]
11191119

@@ -3502,14 +3502,14 @@ def find_library(lib, lib_dirs):
35023502
return None
35033503

35043504

3505-
def process_libraries(link_flags, lib_dirs, linker_inputs):
3505+
def process_libraries(state, linker_inputs):
35063506
new_flags = []
35073507
libraries = []
35083508
suffixes = STATICLIB_ENDINGS + DYNAMICLIB_ENDINGS
35093509
system_libs_map = system_libs.Library.get_usable_variations()
35103510

35113511
# Find library files
3512-
for i, flag in link_flags:
3512+
for i, flag in state.link_flags:
35133513
if not flag.startswith('-l'):
35143514
new_flags.append((i, flag))
35153515
continue
@@ -3527,7 +3527,7 @@ def process_libraries(link_flags, lib_dirs, linker_inputs):
35273527
path = None
35283528
for suff in suffixes:
35293529
name = 'lib' + lib + suff
3530-
path = find_library(name, lib_dirs)
3530+
path = find_library(name, state.lib_dirs)
35313531
if path:
35323532
break
35333533

@@ -3546,7 +3546,7 @@ def process_libraries(link_flags, lib_dirs, linker_inputs):
35463546
# Sort the input list from (order, lib_name) pairs to a flat array in the right order.
35473547
settings.SYSTEM_JS_LIBRARIES.sort(key=lambda lib: lib[0])
35483548
settings.SYSTEM_JS_LIBRARIES = [lib[1] for lib in settings.SYSTEM_JS_LIBRARIES]
3549-
return new_flags
3549+
state.link_flags = new_flags
35503550

35513551

35523552
class ScriptSource:

0 commit comments

Comments
 (0)