From cb87f82d1569449295ecb387104af132da53574e Mon Sep 17 00:00:00 2001 From: Neil Horne <15316949+elecpower@users.noreply.github.com> Date: Sat, 19 Oct 2024 07:28:43 +1100 Subject: [PATCH] chore(tools): reorder msys2 compile steps (#5627) Co-authored-by: elecpower --- tools/msys2_fetch_and_build_all.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/msys2_fetch_and_build_all.sh b/tools/msys2_fetch_and_build_all.sh index 44aee3fc1..a40cc454f 100644 --- a/tools/msys2_fetch_and_build_all.sh +++ b/tools/msys2_fetch_and_build_all.sh @@ -237,6 +237,14 @@ if [[ $PAUSEAFTEREACHLINE == "true" ]]; then read fi +echo "=== Step $((STEP++)): Building radio simulator library ===" +make -C native -j`nproc` libsimulator +check_command $? "make -C native -j`nproc` libsimulator" +if [[ $PAUSEAFTEREACHLINE == "true" ]]; then + echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop." + read +fi + echo "=== Step $((STEP++)): Building Companion ===" make -C native -j`nproc` companion check_command $? "make -C native -j`nproc` companion" @@ -253,14 +261,6 @@ if [[ $PAUSEAFTEREACHLINE == "true" ]]; then read fi -echo "=== Step $((STEP++)): Building radio simulator library ===" -make -C native -j`nproc` libsimulator -check_command $? "make -C native -j`nproc` libsimulator" -if [[ $PAUSEAFTEREACHLINE == "true" ]]; then - echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop." - read -fi - echo "=== Step $((STEP++)): Making an installer ===" make -C native installer check_command $? "make -C native installer"