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

waf: fix configure not using WAF_BUILD

Browse Source 
The configure phase need the WAF_BUILD var defined, otherwise it will
execute code that's only meant for the make build system.
This commit is contained in:
Lucas De Marchi 2016-05-19 09:53:20 -03:00
parent a9d16f3373
commit a9ae5476f3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wscript
View File

@ -88,6 +88,9 @@ def configure(cfg):
cfg.env.BOARD = cfg.options.board
cfg.env.DEBUG = cfg.options.debug
# Allow to differentiate our build from the make build
cfg.define('WAF_BUILD', 1)
cfg.msg('Setting board to', cfg.options.board)
boards.get_board(cfg.env.BOARD).configure(cfg)
@ -130,9 +133,6 @@ def configure(cfg):
# Always use system extensions
cfg.define('_GNU_SOURCE', 1)
# Allow to differentiate our build from the make build
cfg.define('WAF_BUILD', 1)
cfg.write_config_header(os.path.join(cfg.variant, 'ap_config.h'))
def collect_dirs_to_recurse(bld, globs, **kw):