platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-30 10:07:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix LDF recursive behaviour

Browse Source
This commit is contained in:
Ivan Kravets
2019-06-23 21:23:19 +03:00
parent c0a9ae5c70
commit 17fa5f77d5
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
platformio/builder/tools/piolib.py
View File

@ -281,7 +281,8 @@ class LibBuilderBase(object):
if item['name'] != lb.name: if item['name'] != lb.name:
continue continue
found = True found = True
self.depend_recursive(lb) if lb not in self.depbuilders:
self.depend_recursive(lb)
break break
if not found and self.verbose: if not found and self.verbose:
@ -363,8 +364,6 @@ class LibBuilderBase(object):
return result return result
def depend_recursive(self, lb, search_files=None): def depend_recursive(self, lb, search_files=None):
if lb in self.depbuilders:
return
def _already_depends(_lb): def _already_depends(_lb):
if self in _lb.depbuilders: if self in _lb.depbuilders:
@ -892,7 +891,8 @@ class ProjectAsLibBuilder(LibBuilderBase):
for lb in self.env.GetLibBuilders(): for lb in self.env.GetLibBuilders():
if lib_dir not in lb: if lib_dir not in lb:
continue continue
self.depend_recursive(lb) if lb not in self.depbuilders:
self.depend_recursive(lb)
found = True found = True
break break
if found: if found:
@ -903,7 +903,8 @@ class ProjectAsLibBuilder(LibBuilderBase):
for lb in self.env.GetLibBuilders(): for lb in self.env.GetLibBuilders():
if lb.name != uri: if lb.name != uri:
continue continue
self.depend_recursive(lb) if lb not in self.depbuilders:
self.depend_recursive(lb)
found = True found = True
break break