From 477f387bd715cf548e34f6a88a16fd766ce1f123 Mon Sep 17 00:00:00 2001 From: Valeriy Koval Date: Tue, 26 Jan 2016 14:17:49 +0200 Subject: [PATCH] Allow using custom linker script for the libopenCM3 framework. --- platformio/builder/scripts/frameworks/libopencm3.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platformio/builder/scripts/frameworks/libopencm3.py b/platformio/builder/scripts/frameworks/libopencm3.py index 2ae27f72..e48e61a3 100644 --- a/platformio/builder/scripts/frameworks/libopencm3.py +++ b/platformio/builder/scripts/frameworks/libopencm3.py @@ -56,7 +56,6 @@ def find_ldscript(src_dir): elif isfile(join(src_dir, BOARD_BUILDOPTS['ldscript'])): ldscript = join(src_dir, BOARD_BUILDOPTS['ldscript']) - assert isfile(ldscript) return ldscript @@ -169,7 +168,8 @@ if BOARD_BUILDOPTS.get("core") == "stm32": root_dir = join(root_dir, BOARD_BUILDOPTS.get("variant")[5:7]) ldscript_path = find_ldscript(root_dir) -merge_ld_scripts(ldscript_path) +if ldscript_path: + merge_ld_scripts(ldscript_path) generate_nvic_files() # override ldscript by libopencm3