X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmsys2%2Fsigrok-native-msys2;h=f41b67aba824641c590d1f59225dd9ef6d6dc5df;hp=98b248728d7041e1e9ba4332f8aa01dfedbc4fed;hb=8cf06ef35373da908f1a19e9a32a7939dc30f636;hpb=87b105300e4d03dece7227b142991a8ac039cddd

diff --git a/cross-compile/msys2/sigrok-native-msys2 b/cross-compile/msys2/sigrok-native-msys2
index 98b2487..f41b67a 100755
--- a/cross-compile/msys2/sigrok-native-msys2
+++ b/cross-compile/msys2/sigrok-native-msys2
@@ -42,11 +42,18 @@ DEBUG=0
 
 # -----------------------------------------------------------------------------
 
+# Abort if the user runs the script in an "MSYS2 MSYS" shell.
+if [ $MSYSTEM = "MSYS" ]; 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
 
-VER_SIGROK_FIRMWARE_FX2LAFW=0.1.3
+VER_SIGROK_FIRMWARE_FX2LAFW=0.1.6
 
 WGET="wget -c --quiet"
 GIT_CLONE="git clone --depth=1"
@@ -72,9 +79,12 @@ fi
 
 PYPATH=$PREFIX/$PYBASE
 
+# Eliminate the host Python path environment variable, if any is set.
+export PYTHONPATH=
+
 # -----------------------------------------------------------------------------
 
-P="$PREFIX/lib/pkgconfig"
+P="$PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH"
 C="$C --prefix=$PREFIX"
 L="--disable-shared --enable-static"