From 86de58b9e14599a8ecbbc97312db5f57b51165cf Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Wed, 1 Nov 2017 14:09:06 +0200
Subject: [PATCH] Fix missing toolchain include paths for project generator //
 Resolve #1154

---
 HISTORY.rst                        | 4 +++-
 docs                               | 2 +-
 platformio/builder/tools/pioide.py | 2 ++
 platformio/telemetry.py            | 3 +--
 tox.ini                            | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 3439b6a8..dd1c5aea 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -15,6 +15,8 @@ PlatformIO 3.0
 * Fixed issue with "IOError" in VSCode when processing a project
 * Fixed platforms, packages, and libraries updating behind proxy
   (`issue #1061 <https://github.com/platformio/platformio-core/issues/1061>`_)
+* Fixed missing toolchain include paths for project generator
+  (`issue #1154 <https://github.com/platformio/platformio-core/issues/1154>`_)
 
 3.4.1 (2017-08-02)
 ~~~~~~~~~~~~~~~~~~
@@ -22,7 +24,7 @@ PlatformIO 3.0
 * Pre/Post extra scripting for advanced control of PIO Build System
   (`issue #891 <https://github.com/platformio/platformio-core/issues/891>`_)
 * New `lib_archive <http://docs.platformio.org/page/projectconf/section_env_library.html#lib-archive>`_
-  option to control library archiving and linking behaviour
+  option to control library archiving and linking behavior
   (`issue #993 <https://github.com/platformio/platformio-core/issues/993>`_)
 * Add "inc" folder automatically to CPPPATH when "src" is available (works for project and library)
   (`issue #1003 <https://github.com/platformio/platformio-core/issues/1003>`_)
diff --git a/docs b/docs
index 0ab76245..1ceb1ce7 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 0ab7624599f77fb0907dcf03ace2d4d3503630e7
+Subproject commit 1ceb1ce7070d67da6ee44d58a5525eb602dd84a2
diff --git a/platformio/builder/tools/pioide.py b/platformio/builder/tools/pioide.py
index e05b2d79..66cf5d3d 100644
--- a/platformio/builder/tools/pioide.py
+++ b/platformio/builder/tools/pioide.py
@@ -41,6 +41,8 @@ def dump_includes(env):
         toolchain_dir = util.glob_escape(p.get_package_dir(name))
         toolchain_incglobs = [
             join(toolchain_dir, "*", "include*"),
+            join(toolchain_dir, "*", "include", "c++", "*"),
+            join(toolchain_dir, "*", "include", "c++", "*", "*-*-*"),
             join(toolchain_dir, "lib", "gcc", "*", "*", "include*")
         ]
         for g in toolchain_incglobs:
diff --git a/platformio/telemetry.py b/platformio/telemetry.py
index 7c23e6b5..671fe20c 100644
--- a/platformio/telemetry.py
+++ b/platformio/telemetry.py
@@ -15,7 +15,6 @@
 import atexit
 import platform
 import Queue
-import sys
 import threading
 from collections import deque
 from os import getenv
@@ -109,7 +108,7 @@ class MeasurementProtocol(TelemetryBase):
         self['cd1'] = util.get_systype()
         self['cd2'] = "Python/%s %s" % (platform.python_version(),
                                         platform.platform())
-        self['cd3'] = " ".join(_filter_args(sys.argv[1:]))
+        # self['cd3'] = " ".join(_filter_args(sys.argv[1:]))
         self['cd4'] = 1 if (not util.is_ci()
                             and (caller_id or not util.is_container())) else 0
         if caller_id:
diff --git a/tox.ini b/tox.ini
index 1232e76c..9cd861e6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,7 @@ usedevelop = True
 deps =
     isort
     flake8
-    yapf<0.18
+    yapf
     pylint
     pytest
 commands = python --version