From d5b41fe61784be83cdbf1ffcb3dbf72ea9e2a5d5 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Wed, 27 Apr 2016 11:43:48 +0300
Subject: [PATCH] Add support for Microchip PIC32 development platform //
 Resolve #438

---
 HISTORY.rst                                  |  3 +++
 docs/platforms/index.rst                     |  1 +
 platformio/__init__.py                       |  2 +-
 platformio/builder/scripts/microchippic32.py | 13 +++++++++----
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 87a4f77b..9bb538f4 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -13,6 +13,9 @@ PlatformIO 2.0
   development platform for Lattice iCEstick FPGA Evaluation Kit and BQ IceZUM
   Alhambra FPGA
   (`issue #480 <https://github.com/platformio/platformio/issues/480>`_)
+* Added support for `Microchip PIC32 <http://docs.platformio.org/en/latest/platforms/microchippic32.html>`__
+  development platform
+  (`issue #438 <https://github.com/platformio/platformio/issues/438>`_)
 * Updated Arduino core for Espressif platform to 2.2.0
   (`issue #627 <https://github.com/platformio/platformio/issues/627>`_)
 * New boards for `ARM mbed <http://docs.platformio.org/en/latest/frameworks/mbed.html>`__
diff --git a/docs/platforms/index.rst b/docs/platforms/index.rst
index 1f76bf3d..1422e914 100644
--- a/docs/platforms/index.rst
+++ b/docs/platforms/index.rst
@@ -33,6 +33,7 @@ Embedded
     espressif
     freescalekinetis
     lattice_ice40
+    microchippic32
     nordicnrf51
     nxplpc
     siliconlabsefm32
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 9e5ec0bb..3ea5435b 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (2, 9, "0.dev1")
+VERSION = (2, 9, "0.dev2")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/builder/scripts/microchippic32.py b/platformio/builder/scripts/microchippic32.py
index 0bc83186..983b9a18 100644
--- a/platformio/builder/scripts/microchippic32.py
+++ b/platformio/builder/scripts/microchippic32.py
@@ -73,10 +73,7 @@ env.Replace(
         "-mprocessor=$BOARD_MCU",
         "-mno-peripheral-libs",
         "-nostartfiles",
-        "-Wl,--gc-sections",
-        "-Wl,--script=chipKIT-application-COMMON%s.ld" % (
-            "-MZ" if "MZ" in env.get("BOARD_OPTIONS", {}).get(
-                "build", {}).get("mcu") else "")
+        "-Wl,--gc-sections"
     ],
 
     LIBS=["m"],
@@ -149,7 +146,15 @@ for f in env['LINKFLAGS']:
         _new_linkflags.append(f)
     else:
         _new_linkflags.append("-Wl,--script=%s" % f[6:])
+
 env.Replace(LINKFLAGS=_new_linkflags)
+env.Append(
+    LINKFLAGS=[
+        "-Wl,--script=chipKIT-application-COMMON%s.ld" % (
+            "-MZ" if "MZ" in env.get("BOARD_OPTIONS", {}).get(
+                "build", {}).get("mcu") else "")
+    ]
+)
 
 #
 # Target: Build the .hex