Browse Source

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

needed to allow for @FILE syntax for long arg lists
zr-v5.1
Andrew Tridgell 4 years ago
parent
commit
878bd3f0fe
  1. 7
      Tools/ardupilotwaf/toolchain.py

7
Tools/ardupilotwaf/toolchain.py

@ -21,6 +21,7 @@ from waflib import Logs @@ -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): @@ -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:

Loading…
Cancel
Save