Merge branch 'release/v2.2.3'

platformio · Sep 2, 2019 · cd6f5cc · cd6f5cc
2 parents 8f77684 + 2a3850c
commit cd6f5cc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1 @@
+custom: https://platformio.org/donate
diff --git a/builder/main.py b/builder/main.py
@@ -200,7 +200,7 @@ def _update_max_upload_size(env):
 # Target: Build executable and linkable firmware or SPIFFS image
 #
 
-target_elf = None
+target_elf = env.BuildProgram()
 if "nobuild" in COMMAND_LINE_TARGETS:
     target_elf = join("$BUILD_DIR", "${PROGNAME}.elf")
     if set(["uploadfs", "uploadfsota"]) & set(COMMAND_LINE_TARGETS):
@@ -209,7 +209,6 @@ def _update_max_upload_size(env):
     else:
         target_firm = join("$BUILD_DIR", "${PROGNAME}.bin")
 else:
-    target_elf = env.BuildProgram()
     if set(["buildfs", "uploadfs", "uploadfsota"]) & set(COMMAND_LINE_TARGETS):
         target_firm = env.DataToBin(
             join("$BUILD_DIR", "spiffs"), "$PROJECTDATA_DIR")

diff --git a/platform.json b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-espressif8266.git"
   },
-  "version": "2.2.2",
+  "version": "2.2.3",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json",