Merge ASFLAGS and CCFLAGS in a proper way.

platformio/builder/scripts/basearm.py

@@ -31,10 +31,7 @@ env.Replace(
 
     ARFLAGS=["rcs"],
 
-    ASFLAGS=[
-        "-x", "assembler-with-cpp",
-        env.subst("$CCFLAGS")
-    ],
+    ASFLAGS=["-x", "assembler-with-cpp"],
 
     CCFLAGS=[
         "-g",   # include debugging info (so errors include line numbers)
@@ -71,7 +68,10 @@ env.Replace(
     PROGSUFFIX=".elf"
 )
 
+
 env.Append(
+    ASFLAGS=env.get("CCFLAGS", [])[:],
+
     BUILDERS=dict(
         ElfToBin=Builder(
             action=" ".join([

platformio/builder/scripts/baseavr.py

@@ -31,10 +31,7 @@ env.Replace(
 
     ARFLAGS=["rcs"],
 
-    ASFLAGS=[
-        "-x", "assembler-with-cpp",
-        env.subst("$CCFLAGS")
-    ],
+    ASFLAGS=["-x", "assembler-with-cpp"],
 
     CCFLAGS=[
         "-g",  # include debugging info (so errors include line numbers)
@@ -67,6 +64,8 @@ env.Replace(
 )
 
 env.Append(
+    ASFLAGS=env.get("CCFLAGS", [])[:],
+
     BUILDERS=dict(
         ElfToEep=Builder(
             action=" ".join([

platformio/builder/scripts/espressif.py

@@ -64,10 +64,7 @@ env.Replace(
 
     ARFLAGS=["rcs"],
 
-    ASFLAGS=[
-        "-x", "assembler-with-cpp",
-        env.subst("$CCFLAGS")
-    ],
+    ASFLAGS=["-x", "assembler-with-cpp"],
 
     CFLAGS=[
         "-std=gnu99",
@@ -145,6 +142,8 @@ env.Replace(
 )
 
 env.Append(
+    ASFLAGS=env.get("CCFLAGS", [])[:],
+
     BUILDERS=dict(
         ElfToBin=Builder(
             action=" ".join([

platformio/builder/scripts/timsp430.py

@@ -36,10 +36,7 @@ env.Replace(
 
     ARFLAGS=["rcs"],
 
-    ASFLAGS=[
-        "-x", "assembler-with-cpp",
-        env.subst("$CCFLAGS")
-    ],
+    ASFLAGS=["-x", "assembler-with-cpp"],
 
     CCFLAGS=[
         "-g",  # include debugging info (so errors include line numbers)
@@ -77,6 +74,8 @@ env.Replace(
 )
 
 env.Append(
+    ASFLAGS=env.get("CCFLAGS", [])[:],
+
     BUILDERS=dict(
         ElfToHex=Builder(
             action=" ".join([