Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

waf : use LINKFLAGS for pthread 

-pthread is the one supposed to be used because it defines pre-defined
macros as -lpthread doesn't, like was done in
This commit is contained in:
pkancir 2016-01-14 10:04:33 +01:00 committed by Lucas De Marchi
parent 3a24531ade
commit 85f0ef9265
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tools/ardupilotwaf/boards.py
View File

@ -91,9 +91,8 @@ def sitl(env):
env.LIB += [ env.LIB += [
'm', 'm',
'pthread',
] ]
env.LINKFLAGS += ['-pthread',]
env.AP_LIBRARIES += [ env.AP_LIBRARIES += [
'AP_HAL_SITL', 'AP_HAL_SITL',
'SITL', 'SITL',
@ -114,10 +113,9 @@ def linux(env):
env.LIB += [ env.LIB += [
'm', 'm',
'pthread',
'rt', 'rt',
] ]
env.LINKFLAGS += ['-pthread',]
env.AP_LIBRARIES = [ env.AP_LIBRARIES = [
'AP_HAL_Linux', 'AP_HAL_Linux',
] ]

2
Tools/ardupilotwaf/gbenchmark.py
View File

@ -91,7 +91,7 @@ def configure(cfg):
env.INCLUDES_GBENCHMARK = [prefix_node.make_node('include').abspath()] env.INCLUDES_GBENCHMARK = [prefix_node.make_node('include').abspath()]
env.LIBPATH_GBENCHMARK = [prefix_node.make_node('lib').abspath()] env.LIBPATH_GBENCHMARK = [prefix_node.make_node('lib').abspath()]
env.LIB_GBENCHMARK = ['benchmark','pthread'] env.LIB_GBENCHMARK = ['benchmark']
env.HAS_GBENCHMARK = True env.HAS_GBENCHMARK = True