mirror of https://github.com/ArduPilot/ardupilot
waf: fixed cygwin build
This commit is contained in:
parent
6233bc0e10
commit
1ad0c069ae
|
@ -794,6 +794,8 @@ class sitl(Board):
|
||||||
|
|
||||||
if Utils.unversioned_sys_platform() == 'cygwin':
|
if Utils.unversioned_sys_platform() == 'cygwin':
|
||||||
env.CXXFLAGS += ['-DCYGWIN_BUILD']
|
env.CXXFLAGS += ['-DCYGWIN_BUILD']
|
||||||
|
# can't do symbol checking on cygwin due to exception usage in system libraries
|
||||||
|
env.CHECK_SYMBOLS = False
|
||||||
|
|
||||||
if 'clang++' in cfg.env.COMPILER_CXX:
|
if 'clang++' in cfg.env.COMPILER_CXX:
|
||||||
print("Disabling SLP for clang++")
|
print("Disabling SLP for clang++")
|
||||||
|
|
|
@ -150,7 +150,10 @@ def configure(cfg):
|
||||||
cfg.find_program('%s-ar' % cfg.env.TOOLCHAIN, var='AR', quiet=True)
|
cfg.find_program('%s-ar' % cfg.env.TOOLCHAIN, var='AR', quiet=True)
|
||||||
cfg.load('compiler_cxx compiler_c')
|
cfg.load('compiler_cxx compiler_c')
|
||||||
|
|
||||||
cfg.find_program('%s-nm' % cfg.env.TOOLCHAIN, var='NM')
|
if sys.platform.startswith("cygwin"):
|
||||||
|
cfg.find_program('nm', var='NM')
|
||||||
|
else:
|
||||||
|
cfg.find_program('%s-nm' % cfg.env.TOOLCHAIN, var='NM')
|
||||||
|
|
||||||
if not cfg.options.disable_gccdeps:
|
if not cfg.options.disable_gccdeps:
|
||||||
cfg.load('gccdeps')
|
cfg.load('gccdeps')
|
||||||
|
|
Loading…
Reference in New Issue