Skip to content

Commit a2a13bd

Browse files
authored
Delay processing of extern-pre-js and extern-post-js files (#23268)
Processing them early (in phase_linker_setup) meant that they values of some settings had not yet been finalized. Split out from #23261
1 parent a2f7324 commit a2a13bd

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

tools/link.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -700,9 +700,6 @@ def phase_linker_setup(options, state, newargs): # noqa: C901, PLR0912, PLR0915
700700
options.post_js.append(utils.path_from_root('src/threadprofiler.js'))
701701
settings.REQUIRED_EXPORTS.append('emscripten_main_runtime_thread_id')
702702

703-
options.extern_pre_js = read_js_files(options.extern_pre_js)
704-
options.extern_post_js = read_js_files(options.extern_post_js)
705-
706703
# TODO: support source maps with js_transform
707704
if options.js_transform and settings.GENERATE_SOURCE_MAP:
708705
logger.warning('disabling source maps because a js transform is being done')
@@ -2158,13 +2155,15 @@ def phase_final_emitting(options, state, target, wasm_target):
21582155

21592156
# Apply pre and postjs files
21602157
if options.extern_pre_js or options.extern_post_js:
2158+
extern_pre_js = read_js_files(options.extern_pre_js)
2159+
extern_post_js = read_js_files(options.extern_post_js)
21612160
logger.debug('applying extern pre/postjses')
21622161
src = read_file(final_js)
21632162
final_js += '.epp.js'
21642163
with open(final_js, 'w', encoding='utf-8') as f:
2165-
f.write(options.extern_pre_js)
2164+
f.write(extern_pre_js)
21662165
f.write(src)
2167-
f.write(options.extern_post_js)
2166+
f.write(extern_post_js)
21682167
save_intermediate('extern-pre-post')
21692168

21702169
js_manipulation.handle_license(final_js)

0 commit comments

Comments
 (0)