X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmsys2%2Fsigrok-native-msys2;h=1de27c0f5f86749f641c303ae1a47516c0ccdac0;hp=26f8b1467b51d81d3e9f68051f2f46ab28d8d904;hb=9085e553501576251056d4e17bd3a2e58cf038cd;hpb=8708cd82bd28eb7c69c42a2d368d2fe9535f0cbe diff --git a/cross-compile/msys2/sigrok-native-msys2 b/cross-compile/msys2/sigrok-native-msys2 index 26f8b14..1de27c0 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,6 +79,9 @@ fi PYPATH=$PREFIX/$PYBASE +# Eliminate the host Python path environment variable, if any is set. +export PYTHONPATH= + # ----------------------------------------------------------------------------- P="$PREFIX/lib/pkgconfig"