mirror of https://github.com/ArduPilot/ardupilot
waf: boards: load toolchain and compiler before configuring env
This commit is contained in:
parent
da2a71a3de
commit
3b3d59efd1
|
@ -26,6 +26,9 @@ class Board:
|
|||
abstract = True
|
||||
|
||||
def configure(self, cfg):
|
||||
cfg.load('toolchain')
|
||||
cfg.load('compiler_cxx compiler_c')
|
||||
|
||||
env = waflib.ConfigSet.ConfigSet()
|
||||
self.configure_env(cfg, env)
|
||||
|
||||
|
@ -46,9 +49,6 @@ class Board:
|
|||
else:
|
||||
cfg.env[k] = val
|
||||
|
||||
cfg.load('toolchain')
|
||||
cfg.load('compiler_cxx compiler_c')
|
||||
|
||||
def configure_env(self, cfg, env):
|
||||
# Use a dictionary instead of the convetional list for definitions to
|
||||
# make easy to override them. Convert back to list before consumption.
|
||||
|
|
Loading…
Reference in New Issue