From 88ec03ce5a1ae40de61d4ed4eb2531712bf14289 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 25 Jun 2018 16:12:54 +1000 Subject: [PATCH] waf: don't build mavlink for bootloader --- wscript | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/wscript b/wscript index 2a71d353ba..370c710de6 100644 --- a/wscript +++ b/wscript @@ -291,18 +291,19 @@ def _build_cmd_tweaks(bld): bld.options.clear_failed_tests = True def _build_dynamic_sources(bld): - bld( - features='mavgen', - source='modules/mavlink/message_definitions/v1.0/ardupilotmega.xml', - output_dir='libraries/GCS_MAVLink/include/mavlink/v2.0/', - name='mavlink', - # this below is not ideal, mavgen tool should set this, but that's not - # currently possible - export_includes=[ + if not bld.env.BOOTLOADER: + bld( + features='mavgen', + source='modules/mavlink/message_definitions/v1.0/ardupilotmega.xml', + output_dir='libraries/GCS_MAVLink/include/mavlink/v2.0/', + name='mavlink', + # this below is not ideal, mavgen tool should set this, but that's not + # currently possible + export_includes=[ bld.bldnode.make_node('libraries').abspath(), bld.bldnode.make_node('libraries/GCS_MAVLink').abspath(), - ], - ) + ], + ) if bld.get_board().with_uavcan or bld.env.HAL_WITH_UAVCAN==True: bld(