aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

waf: cmake: synchronize cmake build tasks of same configuration

Browse Source 
Running cmake build tasks of the same configuration in parallel my cause race
condition.
This commit is contained in:
Gustavo Jose de Sousa 2016-02-26 21:02:21 +00:00 committed by Lucas De Marchi
parent 8734432196
commit 1233022c78
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tools/ardupilotwaf/cmake.py
View File

@ -177,6 +177,8 @@ def process_cmake_configure(self):
self.cmake_bld = self.bld.bldnode.make_node(self.cmake_bld)
self.cmake_bld.mkdir()
self.last_build_task = None
self.cmake_vars = getattr(self, 'cmake_vars', {})
# NOTE: we'll probably need to use the full class name in waf 1.9
@ -210,6 +212,10 @@ def process_cmake_build(self):
tsk.env.CMAKE_TARGET = self.cmake_target
tsk.set_run_after(self.config_taskgen.cmake_config_task)
if self.config_taskgen.last_build_task:
tsk.set_run_after(self.config_taskgen.last_build_task)
self.config_taskgen.last_build_task = tsk
outputs = Utils.to_list(getattr(self, 'target', ''))
for o in outputs:
if not isinstance(o, Node.Node):