From 8d1937866bedcfc92c717c65e44f2e81125f7b13 Mon Sep 17 00:00:00 2001 From: Ryan Friedman Date: Mon, 22 May 2023 09:42:26 -0600 Subject: [PATCH] Tools: Only enable -Werr for SITL when compiling with g++ Signed-off-by: Ryan Friedman --- Tools/scripts/build_ci.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Tools/scripts/build_ci.sh b/Tools/scripts/build_ci.sh index ca7e92dd03..6fb284607e 100755 --- a/Tools/scripts/build_ci.sh +++ b/Tools/scripts/build_ci.sh @@ -365,10 +365,18 @@ for t in $CI_BUILD_TARGET; do if [ "$t" == "replay" ]; then echo "Building replay" - $waf configure --board sitl --debug --disable-scripting --Werror + + if [ $cxx_compiler == "g++" ]; then + # Only be strict about Werror on SITL when compiling with g++ + # Once the warnings are gone in clang, remove this exception + maybe_werror="--Werror" + fi + $waf configure --board sitl --debug --disable-scripting $maybe_werror + $waf replay echo "Building AP_DAL standalone test" - $waf configure --board sitl --debug --disable-scripting --no-gcs --Werror + $waf configure --board sitl --debug --disable-scripting --no-gcs $maybe_werror + $waf --target tool/AP_DAL_Standalone $waf clean continue