platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-30 10:07:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix builder for mbed framework and ST STM32 platform

Browse Source
This commit is contained in:
Ivan Kravets
2016-01-11 19:20:26 +02:00
parent 3d0aad6df8
commit fa51860268
2 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
HISTORY.rst
View File

@ -4,6 +4,12 @@ Release History
PlatformIO 2.0 PlatformIO 2.0
-------------- --------------
2.7.2 (2016-01-??)
~~~~~~~~~~~~~~~~~~
* Fixed builder for mbed framework and ST STM32 platform
2.7.1 (2016-01-06) 2.7.1 (2016-01-06)
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~

18
platformio/builder/scripts/frameworks/mbed.py
View File

@ -195,20 +195,6 @@ def get_build_flags(data):
return flags return flags
def _mbed_whole_archive_hook(flags):
if (not isinstance(flags, list) or
env.get("BOARD_OPTIONS", {}).get("platform") != "ststm32"):
return flags
for pos, flag in enumerate(flags[:]):
if isinstance(flag, basestring):
continue
flags.insert(pos, "-Wl,-whole-archive")
flags.insert(pos + 2, "-Wl,-no-whole-archive")
return flags
board_type = env.subst("$BOARD") board_type = env.subst("$BOARD")
variant = MBED_VARIANTS[ variant = MBED_VARIANTS[
board_type] if board_type in MBED_VARIANTS else board_type.upper() board_type] if board_type in MBED_VARIANTS else board_type.upper()
@ -219,8 +205,6 @@ build_flags = get_build_flags(eixdata)
variant_dir = join("$PLATFORMFW_DIR", "variant", variant) variant_dir = join("$PLATFORMFW_DIR", "variant", variant)
env.Replace( env.Replace(
_mbed_whole_archive_hook=_mbed_whole_archive_hook,
_LIBFLAGS="${_mbed_whole_archive_hook(%s)}" % env.get("_LIBFLAGS")[2:-1],
CPPFLAGS=build_flags.get("CPPFLAGS", []), CPPFLAGS=build_flags.get("CPPFLAGS", []),
CFLAGS=build_flags.get("CFLAGS", []), CFLAGS=build_flags.get("CFLAGS", []),
CXXFLAGS=build_flags.get("CXXFLAGS", []), CXXFLAGS=build_flags.get("CXXFLAGS", []),
@ -267,7 +251,7 @@ libs.append(env.Library(
for f in eixdata.get("OBJFILES", [])] for f in eixdata.get("OBJFILES", [])]
)) ))
env.Append(LIBS=libs) env.Prepend(LIBS=libs)
for _libname, _libdata in get_used_mbedlibs().iteritems(): for _libname, _libdata in get_used_mbedlibs().iteritems():
for _libar in _libdata['ar']: for _libar in _libdata['ar']: