From 8c331df10568d2fc17065721b731b9aa0c0aeef0 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Thu, 4 Jun 2015 21:24:19 +0300
Subject: [PATCH] Use direct path to LDScript

---
 HISTORY.rst                |  5 +++++
 platformio/__init__.py     |  2 +-
 platformio/builder/main.py | 10 ++++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 65235d65..cae4db12 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,6 +1,11 @@
 Release History
 ===============
 
+2.1.1 (2015-??-??)
+------------------
+
+*
+
 2.1.0 (2015-06-03)
 ------------------
 
diff --git a/platformio/__init__.py b/platformio/__init__.py
index f28df34d..2676be49 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -1,7 +1,7 @@
 # Copyright (C) Ivan Kravets <me@ikravets.com>
 # See LICENSE for details.
 
-VERSION = (2, 1, 0)
+VERSION = (2, 1, "1.dev0")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/builder/main.py b/platformio/builder/main.py
index 4b07953e..12431b15 100644
--- a/platformio/builder/main.py
+++ b/platformio/builder/main.py
@@ -11,7 +11,7 @@ except ImportError:
             break
     from platformio import util
 
-from os.path import join
+from os.path import isfile, join
 from time import time
 
 from SCons.Script import (DefaultEnvironment, Exit, SConscript,
@@ -97,9 +97,11 @@ if "BOARD" in env:
             UPLOAD_SPEED="${BOARD_OPTIONS['upload'].get('speed', None)}")
     if "ldscript" in env.get("BOARD_OPTIONS", {}).get("build", {}):
         env.Replace(
-            LDSCRIPT_PATH=join(
-                "$PIOHOME_DIR", "packages", "ldscripts",
-                "${BOARD_OPTIONS['build']['ldscript']}"
+            LDSCRIPT_PATH=(
+                env['BOARD_OPTIONS']['build']['ldscript']
+                if isfile(env['BOARD_OPTIONS']['build']['ldscript'])
+                else join("$PIOHOME_DIR", "packages", "ldscripts",
+                          "${BOARD_OPTIONS['build']['ldscript']}")
             )
         )