Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

build: use gcc/g++ first

Browse Source 
We currently are unable to build on MacOSX unless we give waf the
--check-cxx-compiler g++. Change the compiler order to search for
gcc/g++ first instead of clang/clang++.
This commit is contained in:
Lucas De Marchi 2016-10-14 17:00:51 -03:00
parent e71c71fcac
commit cc683c1db1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tools/ardupilotwaf/toolchain.py
View File

@ -104,12 +104,12 @@ _set_clang_crosscompilation_wrapper(clangxx)
def _filter_supported_c_compilers(*compilers): def _filter_supported_c_compilers(*compilers):
for k in compiler_c.c_compiler: for k in compiler_c.c_compiler:
l = compiler_c.c_compiler[k] l = compiler_c.c_compiler[k]
compiler_c.c_compiler[k] = [c for c in l if c in compilers] compiler_c.c_compiler[k] = [c for c in compilers if c in l]
def _filter_supported_cxx_compilers(*compilers): def _filter_supported_cxx_compilers(*compilers):
for k in compiler_cxx.cxx_compiler: for k in compiler_cxx.cxx_compiler:
l = compiler_cxx.cxx_compiler[k] l = compiler_cxx.cxx_compiler[k]
compiler_cxx.cxx_compiler[k] = [c for c in l if c in compilers] compiler_cxx.cxx_compiler[k] = [c for c in compilers if c in l]
@conf @conf
def find_toolchain_program(cfg, filename, **kw): def find_toolchain_program(cfg, filename, **kw):