X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmsys2%2Fsigrok-native-msys2;h=f41b67aba824641c590d1f59225dd9ef6d6dc5df;hp=26f8b1467b51d81d3e9f68051f2f46ab28d8d904;hb=d693424c0f6c4fca508c664c6dd950f46d014f91;hpb=8708cd82bd28eb7c69c42a2d368d2fe9535f0cbe

diff --git a/cross-compile/msys2/sigrok-native-msys2 b/cross-compile/msys2/sigrok-native-msys2
index 26f8b14..f41b67a 100755
--- a/cross-compile/msys2/sigrok-native-msys2
+++ b/cross-compile/msys2/sigrok-native-msys2
@@ -43,7 +43,7 @@ DEBUG=0
 # -----------------------------------------------------------------------------
 
 # Abort if the user runs the script in an "MSYS2 MSYS" shell.
-if [ $MSYSTEM = "MSYS2" ]; then
+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
@@ -79,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"