Browse Source

waf: Fix for lttng linking

master
Miguel Arroyo 8 years ago committed by Lucas De Marchi
parent
commit
a2f327678b
  1. 12
      Tools/ardupilotwaf/cxx_checks.py

12
Tools/ardupilotwaf/cxx_checks.py

@ -182,7 +182,7 @@ def check_package(cfg, env, libname): @@ -182,7 +182,7 @@ def check_package(cfg, env, libname):
fragment='''int main() { return 0; }''',
msg='Testing link with %s' % libname,
mandatory=False,
lib='dl'
lib=libname
)
if ret:
@ -193,6 +193,8 @@ def check_package(cfg, env, libname): @@ -193,6 +193,8 @@ def check_package(cfg, env, libname):
cfg.env.revert()
return ret
@conf
def check_lttng(cfg, env):
if cfg.env.STATIC_LINKING:
@ -203,8 +205,12 @@ def check_lttng(cfg, env): @@ -203,8 +205,12 @@ def check_lttng(cfg, env):
cfg.msg("Checking for 'lttng-ust':", 'disabled', color='YELLOW')
return False
check_package(cfg, env, 'lttng-ust')
return True
ret = check_package(cfg, env, 'lttng-ust')
if ret:
cfg.define('HAVE_LTTNG_UST', 1)
return True
return False
@conf
def check_libiio(cfg, env):

Loading…
Cancel
Save