From 85f0ef92651080ca91d3636c32242b432546586f Mon Sep 17 00:00:00 2001
From: pkancir <pierre.kancir@retdtechfrance.com>
Date: Thu, 14 Jan 2016 10:04:33 +0100
Subject: [PATCH] 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
---
 Tools/ardupilotwaf/boards.py     | 6 ++----
 Tools/ardupilotwaf/gbenchmark.py | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Tools/ardupilotwaf/boards.py b/Tools/ardupilotwaf/boards.py
index e4b032dd80..9b5db43fa5 100644
--- a/Tools/ardupilotwaf/boards.py
+++ b/Tools/ardupilotwaf/boards.py
@@ -91,9 +91,8 @@ def sitl(env):
 
     env.LIB += [
         'm',
-        'pthread',
     ]
-
+    env.LINKFLAGS += ['-pthread',]
     env.AP_LIBRARIES += [
         'AP_HAL_SITL',
         'SITL',
@@ -114,10 +113,9 @@ def linux(env):
 
     env.LIB += [
         'm',
-        'pthread',
         'rt',
     ]
-
+    env.LINKFLAGS += ['-pthread',]
     env.AP_LIBRARIES = [
         'AP_HAL_Linux',
     ]
diff --git a/Tools/ardupilotwaf/gbenchmark.py b/Tools/ardupilotwaf/gbenchmark.py
index 5483ee5fad..e13f47ff75 100644
--- a/Tools/ardupilotwaf/gbenchmark.py
+++ b/Tools/ardupilotwaf/gbenchmark.py
@@ -91,7 +91,7 @@ def configure(cfg):
 
     env.INCLUDES_GBENCHMARK = [prefix_node.make_node('include').abspath()]
     env.LIBPATH_GBENCHMARK = [prefix_node.make_node('lib').abspath()]
-    env.LIB_GBENCHMARK = ['benchmark','pthread']
+    env.LIB_GBENCHMARK = ['benchmark']
 
     env.HAS_GBENCHMARK = True