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

Tools: switch compiler for new releases to 10.2

Browse Source 
only sub stable and beta on old compiler
This commit is contained in:
Andrew Tridgell 2022-03-02 08:34:56 +11:00
parent 08d53c2d64
commit 7470920dc6
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Tools/scripts/build_binaries.py
View File

@ -47,7 +47,7 @@ def is_chibios_build(board):
return False return False
def get_required_compiler(tag, board): def get_required_compiler(vehicle, tag, board):
'''return required compiler for a build tag. '''return required compiler for a build tag.
return format is the version string that waf configure will detect. return format is the version string that waf configure will detect.
You should setup a link from this name in $HOME/arm-gcc directory pointing at the You should setup a link from this name in $HOME/arm-gcc directory pointing at the
@ -56,11 +56,11 @@ def get_required_compiler(tag, board):
if not is_chibios_build(board): if not is_chibios_build(board):
# only override compiler for ChibiOS builds # only override compiler for ChibiOS builds
return None return None
if tag == 'latest': if vehicle == 'Sub' and tag in ['stable', 'beta']:
# use 10.2.1 compiler for master builds # sub stable and beta is on the old compiler
return "g++-10.2.1" return "g++-6.3.1"
# for all other builds we use the default compiler in $PATH # use 10.2.1 compiler for all other builds
return None return "g++-10.2.1"
class build_binaries(object): class build_binaries(object):
@ -454,8 +454,9 @@ is bob we will attempt to checkout bob-AVR'''
"--board", board, "--board", board,
"--out", self.buildroot, "--out", self.buildroot,
"clean"] "clean"]
gccstring = get_required_compiler(tag, board) gccstring = get_required_compiler(vehicle, tag, board)
if gccstring is not None: if gccstring is not None and gccstring.find("g++-6.3") == -1:
# versions using the old compiler don't have the --assert-cc-version option
waf_opts += ["--assert-cc-version", gccstring] waf_opts += ["--assert-cc-version", gccstring]
waf_opts.extend(self.board_options(board)) waf_opts.extend(self.board_options(board))