diff --git a/platformio/builder/scripts/atmelsam.py b/platformio/builder/scripts/atmelsam.py
index 482bd5c3..20dd5111 100644
--- a/platformio/builder/scripts/atmelsam.py
+++ b/platformio/builder/scripts/atmelsam.py
@@ -120,7 +120,7 @@ if "due" in env.subst("$BOARD"):
     )
 elif "zero" in env.subst("$BOARD"):
     env.Append(
-        CPPFLAGS=[
+        CCFLAGS=[
             "--param", "max-inline-insns-single=500"
         ],
 
diff --git a/platformio/builder/scripts/basearm.py b/platformio/builder/scripts/basearm.py
index ff11882d..0143b658 100644
--- a/platformio/builder/scripts/basearm.py
+++ b/platformio/builder/scripts/basearm.py
@@ -31,9 +31,12 @@ env.Replace(
 
     ARFLAGS=["rcs"],
 
-    ASPPFLAGS=["-x", "assembler-with-cpp"],
+    ASFLAGS=[
+        "-x", "assembler-with-cpp",
+        "$CCFLAGS"
+    ],
 
-    CPPFLAGS=[
+    CCFLAGS=[
         "-g",   # include debugging info (so errors include line numbers)
         "-Os",  # optimize for size
         "-ffunction-sections",  # place each function in its own section
diff --git a/platformio/builder/scripts/baseavr.py b/platformio/builder/scripts/baseavr.py
index 133e17c9..c2230ad1 100644
--- a/platformio/builder/scripts/baseavr.py
+++ b/platformio/builder/scripts/baseavr.py
@@ -31,9 +31,12 @@ env.Replace(
 
     ARFLAGS=["rcs"],
 
-    ASPPFLAGS=["-x", "assembler-with-cpp"],
+    ASFLAGS=[
+        "-x", "assembler-with-cpp",
+        "$CCFLAGS"
+    ],
 
-    CPPFLAGS=[
+    CCFLAGS=[
         "-g",  # include debugging info (so errors include line numbers)
         "-Os",  # optimize for size
         "-Wall",  # show warnings
diff --git a/platformio/builder/scripts/espressif.py b/platformio/builder/scripts/espressif.py
index 0499c68a..a92b3199 100644
--- a/platformio/builder/scripts/espressif.py
+++ b/platformio/builder/scripts/espressif.py
@@ -64,7 +64,10 @@ env.Replace(
 
     ARFLAGS=["rcs"],
 
-    ASPPFLAGS=["-x", "assembler-with-cpp"],
+    ASFLAGS=[
+        "-x", "assembler-with-cpp",
+        "$CCFLAGS"
+    ],
 
     CFLAGS=[
         "-std=gnu99",
@@ -75,7 +78,7 @@ env.Replace(
         "-nostdlib"
     ],
 
-    CPPFLAGS=[
+    CCFLAGS=[
         "-Os",  # optimize for size
         "-mlongcalls",
         "-mtext-section-literals",
diff --git a/platformio/builder/scripts/nordicnrf51.py b/platformio/builder/scripts/nordicnrf51.py
index 5d2ccc42..ec3a4ab8 100644
--- a/platformio/builder/scripts/nordicnrf51.py
+++ b/platformio/builder/scripts/nordicnrf51.py
@@ -27,7 +27,7 @@ SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", "basearm.py")))
 
 if env.subst("$BOARD") == "rfduino":
     env.Append(
-        CPPFLAGS=["-fno-builtin"],
+        CCFLAGS=["-fno-builtin"],
         LINKFLAGS=["--specs=nano.specs"]
     )
     env.Replace(
diff --git a/platformio/builder/scripts/teensy.py b/platformio/builder/scripts/teensy.py
index 37bfeb1b..310ad8d0 100644
--- a/platformio/builder/scripts/teensy.py
+++ b/platformio/builder/scripts/teensy.py
@@ -31,7 +31,7 @@ elif env.get("BOARD_OPTIONS", {}).get("build", {}).get("core") == "teensy3":
         LINKFLAGS=[
             "-Wl,--defsym=__rtc_localtime=$UNIX_TIME"
         ],
-        CPPFLAGS=[
+        CCFLAGS=[
             "-fsingle-precision-constant"
         ]
     )
diff --git a/platformio/builder/scripts/timsp430.py b/platformio/builder/scripts/timsp430.py
index 525aa5e9..d90f431e 100644
--- a/platformio/builder/scripts/timsp430.py
+++ b/platformio/builder/scripts/timsp430.py
@@ -36,7 +36,10 @@ env.Replace(
 
     ARFLAGS=["rcs"],
 
-    ASPPFLAGS=["-x", "assembler-with-cpp"],
+    ASFLAGS=[
+        "-x", "assembler-with-cpp",
+        "$CCFLAGS"
+    ],
 
     CCFLAGS=[
         "-g",  # include debugging info (so errors include line numbers)