Merge branch 'release/v2.7.0'

platformio · Nov 10, 2017 · e5d9166 · e5d9166
2 parents 19cba01 + 87abbc5
commit e5d9166
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 9 deletions.
diff --git a/builder/frameworks/arduino.py b/builder/frameworks/arduino.py
@@ -50,7 +50,7 @@
 
 env.Append(
     CPPDEFINES=[
-        ("ARDUINO", 10610),
+        ("ARDUINO", 10805),
         ("TEENSYDUINO", FRAMEWORK_VERSION.split(".")[1])
     ],
 

diff --git a/builder/main.py b/builder/main.py
@@ -35,7 +35,6 @@
 
     CXXFLAGS=[
         "-fno-exceptions",
-        "-std=gnu++0x",
         "-felide-constructors"
     ],
 
@@ -71,12 +70,15 @@
         CCFLAGS=[
             "-mmcu=$BOARD_MCU"
         ],
+
         CXXFLAGS=[
-            "-fno-threadsafe-statics"
+            "-std=gnu++11"
         ],
+
         LINKFLAGS=[
             "-mmcu=$BOARD_MCU"
         ],
+
         BUILDERS=dict(
             ElfToEep=Builder(
                 action=env.VerboseAction(" ".join([
@@ -133,17 +135,24 @@
             "-nostdlib",
             "-fsingle-precision-constant"
         ],
+
         CXXFLAGS=[
-            "-fno-rtti"
+            "-fno-rtti",
+            "-std=gnu++14"
         ],
+
         RANLIBFLAGS=["-s"],
+
+        LIBS=["stdc++"],
+
         LINKFLAGS=[
             "-mthumb",
             "-mcpu=%s" % env.BoardConfig().get("build.cpu"),
             "-Wl,--defsym=__rtc_localtime=$UNIX_TIME",
             "-fsingle-precision-constant",
             "--specs=nano.specs"
         ],
+
         BUILDERS=dict(
             ElfToBin=Builder(
                 action=env.VerboseAction(" ".join([
@@ -155,6 +164,7 @@
                 ]), "Building $TARGET"),
                 suffix=".bin"
             ),
+
             ElfToHex=Builder(
                 action=env.VerboseAction(" ".join([
                     "$OBJCOPY",
@@ -171,8 +181,15 @@
     )
     if env.BoardConfig().id_ in ("teensy35", "teensy36"):
         env.Append(
-            LINKFLAGS=["-mfloat-abi=hard", "-mfpu=fpv4-sp-d16"],
-            CCFLAGS=["-mfloat-abi=hard", "-mfpu=fpv4-sp-d16"]
+            CCFLAGS=[
+                "-mfloat-abi=hard",
+                "-mfpu=fpv4-sp-d16"
+            ],
+
+            LINKFLAGS=[
+                "-mfloat-abi=hard",
+                "-mfpu=fpv4-sp-d16"
+            ]
         )
 
 env.Append(

diff --git a/platform.json b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-teensy.git"
   },
-  "version": "2.6.0",
+  "version": "2.7.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json"
@@ -41,12 +41,12 @@
     "framework-arduinoteensy": {
       "type": "framework",
       "optional": true,
-      "version": "~1.136.0"
+      "version": "~1.140.0"
     },
     "framework-mbed": {
       "type": "framework",
       "optional": true,
-      "version": "~4.152.0"
+      "version": "~4.154.0"
     },
     "tool-teensy": {
       "type": "uploader",