feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Upgrad build system to SCons 3.0 // Issue #895

Browse Source
This commit is contained in:
Ivan Kravets
2018-01-26 20:04:43 +02:00
parent 7a40992cc1
commit 59337c71c1
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,7 +90,7 @@ class LibBuilderBase(object):
COMPAT_MODE_DEFAULT = "light"
CLASSIC_SCANNER = SCons.Scanner.C.CScanner()
ADVANCED_SCANNER = SCons.Scanner.C.CScanner(advanced=True)
CCONDITIONAL_SCANNER = SCons.Scanner.C.CConditionalScanner()
PARSE_SRC_BY_H_NAME = True
_INCLUDE_DIRS_CACHE = None
@@ -343,17 +343,15 @@ class LibBuilderBase(object):
for path in self._validate_search_files(search_files):
try:
assert "+" in self.lib_ldf_mode
incs = self.env.File(path).get_found_includes(
self.env, LibBuilderBase.ADVANCED_SCANNER,
tuple(include_dirs))
incs = LibBuilderBase.CCONDITIONAL_SCANNER(
self.env.File(path), self.env, tuple(include_dirs))
except Exception as e: # pylint: disable=broad-except
if self.verbose and "+" in self.lib_ldf_mode:
sys.stderr.write(
"Warning! Classic Pre Processor is used for `%s`, "
"advanced has failed with `%s`\n" % (path, e))
_incs = self.env.File(path).get_found_includes(
self.env, LibBuilderBase.CLASSIC_SCANNER,
tuple(include_dirs))
_incs = LibBuilderBase.CLASSIC_SCANNER(
self.env.File(path), self.env, tuple(include_dirs))
incs = []
for inc in _incs:
incs.append(inc)