Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-26 09:43:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

waf: fix programs searches

Browse Source 
Here we do the following:
    1) Move the pkg-config check to boards.py so we only check of it for
       linux boards
    2) Use cfg.find_toolchain_program() if possible, for example, for AR
This commit is contained in:
Lucas De Marchi 2016-08-02 16:50:04 -03:00
parent f430ef3825
commit e31a06cfdb
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/ardupilotwaf/boards.py
View File

@ -218,6 +218,8 @@ class linux(Board):
def configure_env(self, cfg, env): def configure_env(self, cfg, env):
super(linux, self).configure_env(cfg, env) super(linux, self).configure_env(cfg, env)
cfg.find_toolchain_program('pkg-config', var='PKGCONFIG')
env.DEFINES.update( env.DEFINES.update(
CONFIG_HAL_BOARD = 'HAL_BOARD_LINUX', CONFIG_HAL_BOARD = 'HAL_BOARD_LINUX',
CONFIG_HAL_BOARD_SUBTYPE = 'HAL_BOARD_SUBTYPE_LINUX_NONE', CONFIG_HAL_BOARD_SUBTYPE = 'HAL_BOARD_SUBTYPE_LINUX_NONE',

4
Tools/ardupilotwaf/toolchain.py
View File

@ -133,8 +133,8 @@ def configure(cfg):
_filter_supported_c_compilers('gcc', 'clang') _filter_supported_c_compilers('gcc', 'clang')
_filter_supported_cxx_compilers('g++', 'clang++') _filter_supported_cxx_compilers('g++', 'clang++')
cfg.env.AR = cfg.env.TOOLCHAIN + '-ar' cfg.find_toolchain_program('ar')
cfg.env.PKGCONFIG = cfg.env.TOOLCHAIN + '-pkg-config'
cfg.msg('Using toolchain', cfg.env.TOOLCHAIN) cfg.msg('Using toolchain', cfg.env.TOOLCHAIN)
cfg.load('compiler_cxx compiler_c') cfg.load('compiler_cxx compiler_c')