Use direct path to LDScript

This commit is contained in:
Ivan Kravets committed 2015-06-04 21:24:19 +03:00
1 parent 02d4efcfb5
commit 8c331df105
3 files changed
+12 -5

No files matched your search

+6 -4
View File
@@ -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']}")
)
)