From 1332413f63b8235e97d608f0c56f6a0726b24861 Mon Sep 17 00:00:00 2001
From: Valeriy Koval <valeros@bigmir.net>
Date: Thu, 3 Mar 2016 20:05:51 +0200
Subject: [PATCH] Combine ASFLAGS and CCFLAGS in a proper way

---
 platformio/builder/scripts/basearm.py   | 2 +-
 platformio/builder/scripts/baseavr.py   | 2 +-
 platformio/builder/scripts/espressif.py | 2 +-
 platformio/builder/scripts/timsp430.py  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/platformio/builder/scripts/basearm.py b/platformio/builder/scripts/basearm.py
index 0143b658..34946dd2 100644
--- a/platformio/builder/scripts/basearm.py
+++ b/platformio/builder/scripts/basearm.py
@@ -33,7 +33,7 @@ env.Replace(
 
     ASFLAGS=[
         "-x", "assembler-with-cpp",
-        "$CCFLAGS"
+        env.subst("$CCFLAGS")
     ],
 
     CCFLAGS=[
diff --git a/platformio/builder/scripts/baseavr.py b/platformio/builder/scripts/baseavr.py
index c2230ad1..6645336a 100644
--- a/platformio/builder/scripts/baseavr.py
+++ b/platformio/builder/scripts/baseavr.py
@@ -33,7 +33,7 @@ env.Replace(
 
     ASFLAGS=[
         "-x", "assembler-with-cpp",
-        "$CCFLAGS"
+        env.subst("$CCFLAGS")
     ],
 
     CCFLAGS=[
diff --git a/platformio/builder/scripts/espressif.py b/platformio/builder/scripts/espressif.py
index 1985d411..79e6ebcb 100644
--- a/platformio/builder/scripts/espressif.py
+++ b/platformio/builder/scripts/espressif.py
@@ -66,7 +66,7 @@ env.Replace(
 
     ASFLAGS=[
         "-x", "assembler-with-cpp",
-        "$CCFLAGS"
+        env.subst("$CCFLAGS")
     ],
 
     CFLAGS=[
diff --git a/platformio/builder/scripts/timsp430.py b/platformio/builder/scripts/timsp430.py
index d90f431e..a565a9c8 100644
--- a/platformio/builder/scripts/timsp430.py
+++ b/platformio/builder/scripts/timsp430.py
@@ -38,7 +38,7 @@ env.Replace(
 
     ASFLAGS=[
         "-x", "assembler-with-cpp",
-        "$CCFLAGS"
+        env.subst("$CCFLAGS")
     ],
 
     CCFLAGS=[