@@ -374,8 +374,7 @@ def compile_sources(self, resources, inc_dirs=None):
374
374
375
375
self .notify .cc_verbose ("Macros: " + ' ' .join (['-D%s' % s for s in self .get_symbols ()]))
376
376
377
- inc_paths = [path for _ , path
378
- in resources .get_file_refs (FileType .INC_DIR )]
377
+ inc_paths = resources .get_file_paths (FileType .INC_DIR )
379
378
if inc_dirs is not None :
380
379
if isinstance (inc_dirs , list ):
381
380
inc_paths .extend (inc_dirs )
@@ -628,14 +627,13 @@ def link_program(self, r, tmp_path, name):
628
627
bin = None if ext == 'elf' else full_path
629
628
map = join (tmp_path , name + '.map' )
630
629
631
- objects = sorted (set ([path for _ , path
632
- in r .get_file_refs (FileType .OBJECT )]))
630
+ objects = sorted (set (r .get_file_paths (FileType .OBJECT )))
633
631
config_file = ([self .config .app_config_location ]
634
632
if self .config .app_config_location else [])
635
633
linker_script = [path for _ , path in r .get_file_refs (FileType .LD_SCRIPT )
636
634
if path .endswith (self .LINKER_EXT )][- 1 ]
637
- lib_dirs = [ path for _ , path in r . get_file_refs (FileType .LIB_DIR )]
638
- libraries = [ path for _ , path in r . get_file_refs (FileType .LIB )]
635
+ lib_dirs = r . get_file_paths (FileType .LIB_DIR )
636
+ libraries = r . get_file_paths (FileType .LIB )
639
637
dependencies = objects + libraries + [linker_script ] + config_file
640
638
dependencies .append (join (self .build_dir , self .PROFILE_FILE_NAME + "-ld" ))
641
639
if self .need_update (elf , dependencies ):
0 commit comments