Merge branch 'release/v2.4.0'

platformio · Sep 20, 2017 · 5cc7f1d · 5cc7f1d
2 parents 821e4d9 + 2a642e4
commit 5cc7f1d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/builder/main.py b/builder/main.py
@@ -29,7 +29,7 @@
     RANLIB="arm-none-eabi-ranlib",
     SIZETOOL="arm-none-eabi-size",
 
-    ARFLAGS=["rcs"],
+    ARFLAGS=["rc"],
 
     ASFLAGS=["-x", "assembler-with-cpp"],
 

diff --git a/platform.json b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-siliconlabsefm32.git"
   },
-  "version": "2.3.0",
+  "version": "2.4.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json"
@@ -31,7 +31,7 @@
     "framework-mbed": {
       "type": "framework",
       "optional": true,
-      "version": "~4.149.0"
+      "version": "~4.151.0"
     },
     "tool-openocd": {
       "type": "debugger",