alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ldgen_section_windows_line_ending_v3.3' into 'release/v3.3'

Browse Source 
tools/ldgen: Fix parsing of section names on Windows (v3.3)

See merge request espressif/esp-idf!11037
This commit is contained in:
Angus Gratton 2020-10-30 15:12:05 +08:00
commit 1960d3c700
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/ldgen/generation.py
View File

@ -609,8 +609,8 @@ class SectionsInfo(dict):
archive_path = (Literal("In archive").suppress() +
White().suppress() +
# trim the last character (:) from archive_path
restOfLine.setResultsName("archive_path").setParseAction(lambda t: t[0][:-1]))
# trim the colon and line ending characters from archive_path
restOfLine.setResultsName("archive_path").setParseAction(lambda s, loc, toks: s.rstrip(":\n\r ")))
parser = archive_path
results = None