From 323fd121e4a55fbb5a9daf1d991bc22e5fe89201 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 27 Dec 2018 09:28:28 +1100 Subject: [PATCH] Tools: fixed submodule update order for appveyor --- Tools/scripts/build_appveyor.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Tools/scripts/build_appveyor.sh b/Tools/scripts/build_appveyor.sh index 09a682397f..72c582e35a 100755 --- a/Tools/scripts/build_appveyor.sh +++ b/Tools/scripts/build_appveyor.sh @@ -8,13 +8,16 @@ set -x cd /cygdrive/c/work -# build for 32 bit target -CXX=i686-pc-cygwin-g++.exe CC=i686-pc-cygwin-gcc ./waf configure --board sitl - ( date git submodule update --init --recursive -f - /usr/bin/python waf configure --board sitl + + # build for 32 bit target + export CXX=i686-pc-cygwin-g++.exe + export CC=i686-pc-cygwin-gcc + + ./waf configure --board sitl + /usr/bin/python waf -j4 copter plane rover heli sub # map to the names that MissionPlanner expects @@ -29,6 +32,6 @@ CXX=i686-pc-cygwin-g++.exe CC=i686-pc-cygwin-gcc ./waf configure --board sitl cd /cygdrive/c/work/sitl/ git log -1 > git.txt ls -) > /cygdrive/c/work/sitl/build.txt 2>&1 +) | tee /cygdrive/c/work/sitl/build.txt 2>&1