From 0e52a261cc5c4a832603ea033248e73d8bcc195b Mon Sep 17 00:00:00 2001
From: RichardG867 <richardg867@gmail.com>
Date: Sun, 14 Nov 2021 21:20:47 -0300
Subject: [PATCH] Fix Jenkins CMake flags on MSYSTEM switching

---
 .ci/build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/build.sh b/.ci/build.sh
index 24738fbfb..5d71fcc91 100644
--- a/.ci/build.sh
+++ b/.ci/build.sh
@@ -145,7 +145,7 @@ build() {
 				echo [-] Switching to MSYSTEM [$msys]
 				cd "$cwd"
 				CHERE_INVOKING=yes MSYSTEM="$msys" JOB_BASE_NAME="$JOB_BASE_NAME" BUILD_TYPE="$BUILD_TYPE" BUILD_NUMBER="$BUILD_NUMBER" GIT_COMMIT="$GIT_COMMIT" \
-					bash -lc 'exec "'$0'" -b "'$arch'" '$cmake_flags && job_status=0 # make sure the main script exits cleanly on any success
+					bash -lc 'exec "'$0'" -b "'$arch'" '"$cmake_flags" && job_status=0 # make sure the main script exits cleanly on any success
 				return $?
 			fi
 		else
@@ -354,7 +354,7 @@ EOF
 		:
 	else
 		# Create binary tarball.
-		make_tar ../$job_name-Linux-$arch$build_fn.tar
+		VERBOSE=1 make_tar ../$job_name-Linux-$arch$build_fn.tar
 		local status=$?
 	fi
 	cd ..