X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmsys2%2Fsigrok-native-msys2;h=bb692db82dc30a48bef78bc6e389c14ed503de9c;hp=3084bcb9e0ef0c5d66664dca3d3848aa5dd7a7a9;hb=610b09fa5cf555dc10fd3260f536251b3e864976;hpb=cbb27416befdf449b3421cf50270c6b0e8a606ad

diff --git a/cross-compile/msys2/sigrok-native-msys2 b/cross-compile/msys2/sigrok-native-msys2
index 3084bcb..bb692db 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 = "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
@@ -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"
 
@@ -99,7 +109,8 @@ if [ "x$1" = "xprepare" ]; then
 	autoconf automake autoconf-archive libtool make pkg-config wget patch \
 	$W-toolchain $W-glib2 $W-glibmm $W-libusb $W-libftdi $W-check $W-boost \
 	$W-libzip $W-doxygen $W-python3 $W-python3-numpy $W-python3-gobject \
-	$W-python3-setuptools $W-swig $W-qt5-static $W-cmake $W-nsis
+	$W-python3-setuptools $W-swig $W-qt5-static $W-cmake $W-nsis \
+	$W-hidapi
   exit
 fi