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

Tools: Revert "Tools: autotest: use custom gcc for ChibiOS builds"

Browse Source 
This reverts commit 78a3e1d07a.

Apparently we can release with the existing compilers, it builds and
flies just fine
This commit is contained in:
Peter Barker 2018-03-23 12:54:14 +11:00
parent 97565ef97f
commit cafa5382e9
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Tools/scripts/build_binaries.py
View File

@ -308,11 +308,6 @@ is bob we will attempt to checkout bob-AVR'''
with open(filepath, "a"):
pass
def board_is_chibios(self, board):
if board == 'skyviper-v2450':
return True;
return False
def build_vehicle(self, tag, vehicle, boards, vehicle_binaries_subdir,
binaryname, px4_binaryname, frames=[None]):
'''build vehicle binaries'''
@ -359,18 +354,6 @@ is bob we will attempt to checkout bob-AVR'''
continue
self.progress("Configuring for %s in %s" %
(board, self.buildroot))
orig_path = os.environ["PATH"]
if self.board_is_chibios(board):
# need to run a more modern compiler for ChibiOS:
environ_varname = "CHIBIOS_GCC_DIRPATH"
gcc_dirpath = os.getenv(environ_varname, None)
if gcc_dirpath is None:
self.progress("Skipping ChibiOS build %s (no %s)" %
(board, environ_varname))
continue
self.progress("Using ChibiOS GCC (%s)" % gcc_dirpath)
os.environ['PATH'] = ":".join([os.path.join(gcc_dirpath,"bin"),
orig_path])
try:
waf_opts = ["configure",
"--board", board,
@ -380,7 +363,6 @@ is bob we will attempt to checkout bob-AVR'''
self.run_waf(waf_opts)
except subprocess.CalledProcessError as e:
self.progress("waf configure failed")
os.environ["PATH"] = orig_path
continue
try:
target = os.path.join("bin",
@ -391,9 +373,7 @@ is bob we will attempt to checkout bob-AVR'''
(vehicle, board, framesuffix, tag))
self.progress(msg)
self.error_strings.append(msg)
os.environ["PATH"] = orig_path
continue
os.environ["PATH"] = orig_path
bare_path = os.path.join(self.buildroot,
board,