ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace 'resolution_order_names' and 'extra_labels' with 'labels' 

Get rid of 'next' function
pull/10295/head
Andrii Lishchynskyi 2019-04-03 12:21:13 +03:00
parent 71e041689d
commit 1f16fec408
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/export/cdt/__init__.py
View File

@ -45,16 +45,15 @@ class Eclipse(Makefile):
if configuration in defaults: if configuration in defaults:
eclipse_config.update(defaults[configuration]) eclipse_config.update(defaults[configuration])
# Get target-specific options. Use resolution order and extra labels # Get target-specific options. Use labels to find alias
# to find alias for target. This allows to define options within inheritance path # for target. This allows to define options within inheritance path
target_specific = _CONFIGS_OPTIONS['targets'] target_specific = _CONFIGS_OPTIONS['targets']
aliases = self.toolchain.target.resolution_order_names \ aliases = self.toolchain.target.labels
+ self.toolchain.target.extra_labels for target_alias in aliases:
target_alias = next((t for t in aliases if t in target_specific), None) if target_alias in target_specific:
if target_alias: eclipse_config.update(target_specific[target_alias]['generic'])
eclipse_config.update(target_specific[target_alias]['generic']) if configuration in target_specific[target_alias]:
if configuration in target_specific[target_alias]: eclipse_config.update(target_specific[target_alias][configuration])
eclipse_config.update(target_specific[target_alias][configuration])
return eclipse_config return eclipse_config