Merge branch 'release/v3.4.1'

ivankravets · ivankravets · commit ade19a56dadb · 2018-08-11T15:57:23.000+03:00
diff --git a/builder/main.py b/builder/main.py
@@ -74,6 +74,9 @@
     )
 )
 
+if not env.get("PIOFRAMEWORK"):
+    env.SConscript("frameworks/_bare.py")
+
 #
 # Target: Build executable and linkable firmware
 #
diff --git a/platform.json b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-nxplpc.git"
   },
-  "version": "3.4.0",
+  "version": "3.4.1",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json"

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,9 @@`
`74`	`74`	`)`
`75`	`75`	`)`
`76`	`76`
	`77`	`+if not env.get("PIOFRAMEWORK"):`
	`78`	`+ env.SConscript("frameworks/_bare.py")`
	`79`	`+`
`77`	`80`	`#`
`78`	`81`	`# Target: Build executable and linkable firmware`
`79`	`82`	`#`