Fix PlatformIO version

platformio/builder/main.py

@@ -114,6 +114,12 @@ DefaultEnvironment(
 
 env = DefaultEnvironment()
 
+# Append PlatformIO version
+env.Append(
+    CPPDEFINES=["PLATFORMIO={0:02d}{1:02d}{2:02d}".format(
+        *util.pioversion_to_intstr())]
+)
+
 if "BOARD" in env:
     try:
         env.Replace(BOARD_OPTIONS=util.get_boards(env.subst("$BOARD")))

platformio/builder/tools/platformio.py

@@ -23,8 +23,6 @@ from SCons.Script import (COMMAND_LINE_TARGETS, DefaultEnvironment, Exit,
                           SConscript)
 from SCons.Util import case_sensitive_suffixes
 
-from platformio.util import pioversion_to_intstr
-
 SRC_BUILD_EXT = ["c", "cpp", "S", "spp", "SPP", "sx", "s", "asm", "ASM"]
 SRC_HEADER_EXT = ["h", "hpp"]
 SRC_DEFAULT_FILTER = " ".join([
@@ -73,11 +71,6 @@ def BuildProgram(env):
         getenv("PLATFORMIO_SRC_BUILD_FLAGS"),
     ])
 
-    env.Append(
-        CPPDEFINES=["PLATFORMIO={0:02d}{1:02d}{2:02d}".format(
-            *pioversion_to_intstr())]
-    )
-
     return env.Program(
         join("$BUILD_DIR", env.subst("$PROGNAME")),
         env.LookupSources(