Merge branch 'hotfix/v3.5.5' into develop

* hotfix/v3.5.5:
  Fixed an issue with PIO Remote  when upload process depends on the source code of a project framework
This commit is contained in:
Ivan Kravets committed 2018-07-30 14:26:35 +03:00
commit 41432d4075
3 files changed
+11 -7

No files matched your search

+2 -1
View File
@@ -307,7 +307,8 @@ def BuildFrameworks(env, frameworks):
if f in ("arduino", "energia"):
# Arduino IDE appends .o the end of filename
Builder.match_splitext = scons_patched_match_splitext
env.ConvertInoToCpp()
if "nobuild" not in COMMAND_LINE_TARGETS:
env.ConvertInoToCpp()
if f in board_frameworks:
SConscript(env.GetFrameworkScript(f), exports="env")