Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-21 16:18:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

waf: use /usr/bin/ar not arm-none-eabi-ar on cygwin

Browse Source 
needed to allow for @FILE syntax for long arg lists
This commit is contained in:
Andrew Tridgell 2021-04-20 14:22:42 +10:00
parent dd86e0cc89
commit 878bd3f0fe
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Tools/ardupilotwaf/toolchain.py
View File

@ -21,6 +21,7 @@ from waflib import Logs
import os
import re
import sys
@conf
def find_gxx(conf):
@ -142,7 +143,11 @@ def configure(cfg):
return
_set_pkgconfig_crosscompilation_wrapper(cfg)
cfg.find_program('%s-ar' % cfg.env.TOOLCHAIN, var='AR', quiet=True)
if sys.platform.startswith("cygwin") or True:
# on cygwin arm-none-eabi-ar doesn't support the @FILE syntax for splitting long lines
cfg.find_program('ar', var='AR', quiet=True)
else:
cfg.find_program('%s-ar' % cfg.env.TOOLCHAIN, var='AR', quiet=True)
cfg.load('compiler_cxx compiler_c')
if not cfg.options.disable_gccdeps: