aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

waf: load compilers tools in toolchain tool

Browse Source 
It makes more sense the toolchain Waf tool to be responsible of loading the
compilers. Furthermore, that allows toolchain tool to have control on doing
configuration before and after loading compiler tools.
This commit is contained in:
Gustavo Jose de Sousa 2016-03-21 20:55:23 -03:00 committed by Lucas De Marchi
parent 19d6a88e84
commit 95aeb0346e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Tools/ardupilotwaf/boards.py
View File

@ -31,7 +31,6 @@ class Board:
def configure(self, cfg):
cfg.env.TOOLCHAIN = self.toolchain
cfg.load('toolchain')
cfg.load('compiler_cxx compiler_c')
env = waflib.ConfigSet.ConfigSet()
self.configure_env(cfg, env)

9
Tools/ardupilotwaf/toolchain.py
View File

@ -1,15 +1,15 @@
"""
WAF Tool to select the correct toolchain based on the target archtecture.
This tool must be loaded before compiler tools. Use the environment variable
TOOLCHAIN to define the toolchain prefix.
This tool loads compiler_c and compiler_cxx, so you don't need to load them
(and you must not load them before this tool). Use the environment variable
TOOLCHAIN to define the toolchain.
Example::
def configure(cfg):
cfg.env.TOOLCHAIN = 'arm-linux-gnueabihf'
cfg.load('toolchain')
cfg.load('cxx_compiler')
"""
from waflib import Utils, Context
@ -44,6 +44,7 @@ def configure(cfg):
toolchain = cfg.env.TOOLCHAIN
if toolchain == 'native':
cfg.load('compiler_cxx compiler_c')
return
cfg.msg('Using toolchain', toolchain)
@ -84,3 +85,5 @@ def configure(cfg):
elif 'clang++' == cxx_compiler:
cfg.env['CXX'] = 'clang++'
cfg.env.CXXFLAGS += clang_flags
cfg.load('compiler_cxx compiler_c')