Skip to content

[tools][eclipse] Sync assembler include paths #11762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wdfk-prog wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −2
Open

[tools][eclipse] Sync assembler include paths #11762

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions tools/targets/eclipse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ def HandleToolOption(tools, env, project, reset):
paths = [ConverToRttEclipsePathFormat(RelativeProjectPath(env, os.path.normpath(i)).replace('\\', '/')) for i in project['CPPPATH']]

compile_include_paths_options = []
assembler_include_paths_options = []
compile_include_files_options = []
compile_defs_options = []
linker_scriptfile_option = None
Expand All @@ -200,7 +201,9 @@ def HandleToolOption(tools, env, project, reset):
# find all compile options
for option in options:
option_id = option.get('id')
if ('compiler.include.paths' in option_id) or ('compiler.option.includepaths' in option_id) or ('compiler.tasking.include' in option_id):
if ('assembler.include.paths' in option_id) or ('assembler.option.includepaths' in option_id):
assembler_include_paths_options += [option]
elif ('compiler.include.paths' in option_id) or ('compiler.option.includepaths' in option_id) or ('compiler.tasking.include' in option_id):
compile_include_paths_options += [option]
elif option.get('id').find('compiler.include.files') != -1 or option.get('id').find('compiler.option.includefiles') != -1 :
compile_include_files_options += [option]
Expand Down Expand Up @@ -229,7 +232,7 @@ def HandleToolOption(tools, env, project, reset):
linker_newlib_nano_option = option

# change the inclue path
for option in compile_include_paths_options:
for option in compile_include_paths_options + assembler_include_paths_options:
# find all of paths in this project
include_paths = option.findall('listOptionValue')
for item in include_paths:
Expand Down
Loading