diff --git a/platformio/builder/scripts/basearm.py b/platformio/builder/scripts/basearm.py
index a5912786..94ccfec4 100644
--- a/platformio/builder/scripts/basearm.py
+++ b/platformio/builder/scripts/basearm.py
@@ -18,16 +18,10 @@ env.Replace(
     RANLIB="arm-none-eabi-ranlib",
     SIZETOOL="arm-none-eabi-size",
 
-    ARFLAGS=["rcs"],
+    ASCOM=("$AS -o $TARGET -c -x assembler-with-cpp "
+           "$CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES"),
 
-    ASFLAGS=[
-        "-c",
-        "-g",  # include debugging info (so errors include line numbers)
-        "-x", "assembler-with-cpp",
-        "-Wall",
-        "-mthumb",
-        "-mcpu=${BOARD_OPTIONS['build']['cpu']}"
-    ],
+    ARFLAGS=["rcs"],
 
     CPPFLAGS=[
         "-g",   # include debugging info (so errors include line numbers)
diff --git a/platformio/builder/scripts/baseavr.py b/platformio/builder/scripts/baseavr.py
index 3164de91..f089937b 100644
--- a/platformio/builder/scripts/baseavr.py
+++ b/platformio/builder/scripts/baseavr.py
@@ -18,14 +18,10 @@ env.Replace(
     RANLIB="avr-ranlib",
     SIZETOOL="avr-size",
 
-    ARFLAGS=["rcs"],
+    ASCOM=("$AS -o $TARGET -c -x assembler-with-cpp "
+           "$CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES"),
 
-    ASFLAGS=[
-        "-c",
-        "-g",  # include debugging info (so errors include line numbers)
-        "-x", "assembler-with-cpp",
-        "-mmcu=$BOARD_MCU"
-    ],
+    ARFLAGS=["rcs"],
 
     CCFLAGS=[
         "-g",  # include debugging info (so errors include line numbers)
diff --git a/platformio/builder/scripts/timsp430.py b/platformio/builder/scripts/timsp430.py
index 1fcf3272..38acec2f 100644
--- a/platformio/builder/scripts/timsp430.py
+++ b/platformio/builder/scripts/timsp430.py
@@ -23,14 +23,10 @@ env.Replace(
     RANLIB="msp430-ranlib",
     SIZETOOL="msp430-size",
 
-    ARFLAGS=["rcs"],
+    ASCOM=("$AS -o $TARGET -c -x assembler-with-cpp "
+           "$CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES"),
 
-    ASFLAGS=[
-        "-c",
-        "-g",  # include debugging info (so errors include line numbers)
-        "-x", "-assembler-with-cpp",
-        "-mmcu=$BOARD_MCU"
-    ],
+    ARFLAGS=["rcs"],
 
     CCFLAGS=[
         "-g",  # include debugging info (so errors include line numbers)
diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py
index 6fe231b0..153966ff 100644
--- a/platformio/builder/tools/platformio.py
+++ b/platformio/builder/tools/platformio.py
@@ -50,7 +50,7 @@ def BuildFirmware(env, corelibs):
 
     # enable "cyclic reference" for linker
     firmenv.Prepend(
-        _LIBFLAGS="-Wl,--start-group ",
+        _LIBFLAGS="-Wl,--start-group "
     )
     firmenv.Append(
         _LIBFLAGS=" -Wl,--end-group"