From 64b8ec61c7731067f13d5d07834e96ad9ad63f64 Mon Sep 17 00:00:00 2001
From: Gustavo Jose de Sousa <gustavo.sousa@intel.com>
Date: Fri, 20 May 2016 16:44:41 -0300
Subject: [PATCH] waf: set lib as output dir for static libraries

---
 Tools/ardupilotwaf/ardupilotwaf.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Tools/ardupilotwaf/ardupilotwaf.py b/Tools/ardupilotwaf/ardupilotwaf.py
index e6591f6f39..8579f451ec 100644
--- a/Tools/ardupilotwaf/ardupilotwaf.py
+++ b/Tools/ardupilotwaf/ardupilotwaf.py
@@ -198,6 +198,13 @@ def ap_create_program_dir(self):
     self.bld.bldnode.make_node(self.program_dir).mkdir()
     _created_program_dirs.add(self.program_dir)
 
+@feature('cxxstlib')
+@before_method('process_rule')
+def ap_stlib_target(self):
+    if self.target.startswith('#'):
+        self.target = self.target[1:]
+    self.target = '#%s' % os.path.join('lib', self.target)
+
 @conf
 def ap_find_tests(bld, use=[]):
     if not bld.env.HAS_GTEST: