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

Use SCons "gas" tool instead of "as"

Browse Source
This commit is contained in:
Ivan Kravets
2018-01-26 20:50:33 +02:00
parent 59337c71c1
commit b6ad672f6a
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platformio/builder/main.py
View File

@ -75,7 +75,7 @@ MULTILINE_VARS = [
DEFAULT_ENV_OPTIONS = dict( DEFAULT_ENV_OPTIONS = dict(
tools=[ tools=[
"ar", "as", "gcc", "g++", "gnulink", "platformio", "pioplatform", "ar", "gas", "gcc", "g++", "gnulink", "platformio", "pioplatform",
"piowinhooks", "piolib", "pioupload", "piomisc", "pioide" "piowinhooks", "piolib", "pioupload", "piomisc", "pioide"
], # yapf: disable ], # yapf: disable
toolpath=[join(util.get_source_dir(), "builder", "tools")], toolpath=[join(util.get_source_dir(), "builder", "tools")],

7
platformio/builder/tools/piolib.py
View File

@ -796,9 +796,8 @@ def GetLibBuilders(env): # pylint: disable=too-many-branches
def BuildProjectLibraries(env): def BuildProjectLibraries(env):
lib_builders = env.GetLibBuilders()
def correct_found_libs(): def correct_found_libs(lib_builders):
# build full dependency graph # build full dependency graph
found_lbs = [lb for lb in lib_builders if lb.dependent] found_lbs = [lb for lb in lib_builders if lb.dependent]
for lb in lib_builders: for lb in lib_builders:
@ -836,13 +835,15 @@ def BuildProjectLibraries(env):
print "Library Dependency Finder -> http://bit.ly/configure-pio-ldf" print "Library Dependency Finder -> http://bit.ly/configure-pio-ldf"
print "Modes: Finder/%s Compatibility/%s" % (ldf_mode, print "Modes: Finder/%s Compatibility/%s" % (ldf_mode,
project.lib_compat_mode) project.lib_compat_mode)
lib_builders = env.GetLibBuilders()
print "Collected %d compatible libraries" % len(lib_builders) print "Collected %d compatible libraries" % len(lib_builders)
print "Scanning dependencies..." print "Scanning dependencies..."
project.search_deps_recursive() project.search_deps_recursive()
if ldf_mode.startswith("chain") and project.depbuilders: if ldf_mode.startswith("chain") and project.depbuilders:
correct_found_libs() correct_found_libs(lib_builders)
if project.depbuilders: if project.depbuilders:
print "Dependency Graph" print "Dependency Graph"

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

@ -44,7 +44,7 @@ def BuildProgram(env):
env.PrintSystemInfo() env.PrintSystemInfo()
# fix ASM handling under non-casitive OS # fix ASM handling under non case-sensitive OS
if not case_sensitive_suffixes(".s", ".S"): if not case_sensitive_suffixes(".s", ".S"):
env.Replace(AS="$CC", ASCOM="$ASPPCOM") env.Replace(AS="$CC", ASCOM="$ASPPCOM")