Browse Source

waf: boards: load toolchain and compiler before configuring env

mission-4.1.18
Francisco Ferreira 9 years ago committed by Lucas De Marchi
parent
commit
3b3d59efd1
  1. 6
      Tools/ardupilotwaf/boards.py

6
Tools/ardupilotwaf/boards.py

@ -26,6 +26,9 @@ class Board: @@ -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: @@ -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…
Cancel
Save