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
13 changes: 11 additions & 2 deletions tools/link.py
Original file line number Diff line number Diff line change
Expand Up @@ -2180,6 +2180,15 @@ def create_esm_wrapper(wrapper_file, support_target, wasm_target):
shared.check_call(cmd, input=mod)


def convert_line_endings_in_file(filename, to_eol):
if to_eol == os.linesep:
assert os.path.exists(filename)
return # No conversion needed

text = read_file(filename)
write_file(filename, text, line_endings=to_eol)


@ToolchainProfiler.profile_block('final emitting')
def phase_final_emitting(options, target, js_target, wasm_target):
global final_js
Expand Down Expand Up @@ -2242,7 +2251,7 @@ def phase_final_emitting(options, target, js_target, wasm_target):

target_basename = unsuffixed_basename(target)

utils.convert_line_endings_in_file(js_target, options.output_eol)
convert_line_endings_in_file(js_target, options.output_eol)

# If we were asked to also generate HTML, do that
if options.oformat == OFormat.HTML:
Expand Down Expand Up @@ -2632,7 +2641,7 @@ def generate_html(target, options, js_target, target_basename, wasm_target):
if settings.MINIFY_HTML and (settings.OPT_LEVEL >= 1 or settings.SHRINK_LEVEL >= 1):
minify_html(target)

utils.convert_line_endings_in_file(target, options.output_eol)
convert_line_endings_in_file(target, options.output_eol)


def find_library(lib, lib_dirs):
Expand Down
9 changes: 0 additions & 9 deletions tools/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,15 +152,6 @@ def safe_copy(src, dst):
make_writable(dst)


def convert_line_endings_in_file(filename, to_eol):
if to_eol == os.linesep:
assert os.path.exists(filename)
return # No conversion needed

text = read_file(filename)
write_file(filename, text, line_endings=to_eol)


def read_file(file_path):
"""Read from a file opened in text mode"""
with open(file_path, encoding='utf-8') as fh:
Expand Down