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

Fixed SCons warning: Two different environments were specified for target // Resolve #77

Browse Source
This commit is contained in:
Ivan Kravets
2015-02-16 23:17:22 +02:00
parent 0d2d6cc17e
commit 69d952ea65
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platformio/builder/tools/platformio.py
View File

@ -213,16 +213,13 @@ def BuildDependentLibraries(env, src_dir): # pylint: disable=R0914
finder = IncludeFinder(base_dir, inc_name, inc_type == "<") finder = IncludeFinder(base_dir, inc_name, inc_type == "<")
if finder.run(): if finder.run():
_lib_dir = finder.getLibDir() _parse_includes(state, env.File(finder.getIncPath()))
_lib_dir = finder.getLibDir()
if _lib_dir and _lib_dir not in state['libs']: if _lib_dir and _lib_dir not in state['libs']:
state['ordered'].add(( state['ordered'].add((
len(state['ordered']) + 1, finder.getLibName(), len(state['ordered']) + 1, finder.getLibName(),
_lib_dir)) _lib_dir))
_parse_includes(state, env.File(finder.getIncPath()))
if _lib_dir and _lib_dir not in state['libs']:
state['libs'].add(_lib_dir) state['libs'].add(_lib_dir)
state = _process_src_dir(state, _lib_dir) state = _process_src_dir(state, _lib_dir)
return state return state
@ -237,7 +234,7 @@ def BuildDependentLibraries(env, src_dir): # pylint: disable=R0914
if isdir(join(ld, "utility"))]) if isdir(join(ld, "utility"))])
libs = [] libs = []
for (libname, inc_dir) in reversed(deplibs): for (libname, inc_dir) in deplibs:
lib = env.BuildLibrary( lib = env.BuildLibrary(
join("$BUILD_DIR", libname), inc_dir) join("$BUILD_DIR", libname), inc_dir)
env.Clean(libname, lib) env.Clean(libname, lib)