From: Uwe Hermann <redacted>
Date: Sat, 10 Feb 2018 17:46:32 +0000 (+0100)
Subject: sigrok-native-msys2: Abort if run in an "MSYS2 MSYS" shell.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=8708cd82bd28eb7c69c42a2d368d2fe9535f0cbe;p=sigrok-util.git

sigrok-native-msys2: Abort if run in an "MSYS2 MSYS" shell.
---

diff --git a/cross-compile/msys2/sigrok-native-msys2 b/cross-compile/msys2/sigrok-native-msys2
index 3084bcb..26f8b14 100755
--- a/cross-compile/msys2/sigrok-native-msys2
+++ b/cross-compile/msys2/sigrok-native-msys2
@@ -42,6 +42,13 @@ DEBUG=0
 
 # -----------------------------------------------------------------------------
 
+# Abort if the user runs the script in an "MSYS2 MSYS" shell.
+if [ $MSYSTEM = "MSYS2" ]; then
+	echo "Building in an 'MSYS2 MSYS' shell will not work, aborting."
+	echo "Please use the 'MSYS2 MinGW 64-bit' (or 32-bit) shell."
+	exit
+fi
+
 # The build target type: "i686" (32bit) or "x86_64" (64bit).
 # This is selected based on which MSYS2 shell is being used to do the build.
 TARGET=$MSYSTEM_CARCH