From d663a748f29d160e9fb4b08fac87485e28def488 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Sun, 17 Jan 2016 00:33:00 -0200 Subject: [PATCH] waf: fix blddestdir The destination directory for binaries should be //bin/ and not ///bin The same reasoning can be applied for others: tools, examples, etc should follow the same rule. Before this patch, compiling for example ArduPlane for navio we would have: [339/339] Linking build/navio/ArduPlane/bin/ArduPlane And now we have: [339/339] Linking build/navio/bin/ArduPlane --- Tools/ardupilotwaf/ardupilotwaf.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Tools/ardupilotwaf/ardupilotwaf.py b/Tools/ardupilotwaf/ardupilotwaf.py index 78e1f36152..5410b4f58c 100644 --- a/Tools/ardupilotwaf/ardupilotwaf.py +++ b/Tools/ardupilotwaf/ardupilotwaf.py @@ -94,11 +94,12 @@ def program(bld, blddestdir='bin', kw['features'] = common_features(bld) + kw.get('features', []) - target = os.path.join(blddestdir, program_name) + name = os.path.join(blddestdir, program_name) + target = bld.bldnode.find_or_declare(name) bld.program( target=target, - name=target, + name=name, **kw )