feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Enable linker "cyclic dependencies" for all platforms

Browse Source
This commit is contained in:
Ivan Kravets
2015-02-14 22:14:49 +02:00
parent 2bfb1d5569
commit 88f0b51312
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platformio/builder/scripts/atmelavr.py
View File

@ -55,8 +55,7 @@ env.Replace(
LINKFLAGS=[ LINKFLAGS=[
"-Os", "-Os",
"-mmcu=$BOARD_MCU", "-mmcu=$BOARD_MCU",
"-Wl,--gc-sections", "-Wl,--gc-sections"
"-Wl,--start-group"
], ],
SIZEPRINTCMD='"$SIZETOOL" --mcu=$BOARD_MCU -C -d $SOURCES', SIZEPRINTCMD='"$SIZETOOL" --mcu=$BOARD_MCU -C -d $SOURCES',

22
platformio/builder/tools/platformio.py
View File

@ -43,21 +43,29 @@ def ProcessGeneral(env):
def BuildFirmware(env, corelibs): def BuildFirmware(env, corelibs):
src = env.Clone() firmenv = env.Clone()
vdirs = src.VariantDirRecursive( vdirs = firmenv.VariantDirRecursive(
join("$BUILD_DIR", "src"), join("$PROJECT_DIR", "src")) join("$BUILD_DIR", "src"), join("$PROJECT_DIR", "src"))
# build dependent libs # build dependent libs
deplibs = src.BuildDependentLibraries(join("$PROJECT_DIR", "src")) deplibs = firmenv.BuildDependentLibraries(join("$PROJECT_DIR", "src"))
if deplibs:
firmenv.Prepend(
_LIBFLAGS="-Wl,--start-group "
)
firmenv.Append(
_LIBFLAGS=" -Wl,--end-group "
)
src.MergeFlags(getenv("PIOSRCBUILD_FLAGS", "$SRCBUILD_FLAGS")) firmenv.MergeFlags(getenv("PIOSRCBUILD_FLAGS", "$SRCBUILD_FLAGS"))
return src.Program( return firmenv.Program(
join("$BUILD_DIR", "firmware"), join("$BUILD_DIR", "firmware"),
[src.GlobCXXFiles(vdir) for vdir in vdirs], [firmenv.GlobCXXFiles(vdir) for vdir in vdirs],
LIBS=deplibs + corelibs, LIBS=deplibs + corelibs,
LIBPATH="$BUILD_DIR", LIBPATH="$BUILD_DIR",
PROGSUFFIX=".elf") PROGSUFFIX=".elf"
)
def GlobCXXFiles(env, path): def GlobCXXFiles(env, path):