X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=8b30158cf38baa612349e969e850ea6c041f10f0;hp=66ce718509aa325077bb17e0360d8bef00a21979;hb=01b17442b9132403deef1486be5a46fea333e83c;hpb=c2d27140627d695b9ca04327d4bea80d87dc0839 diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw index 66ce718..8b30158 100755 --- a/cross-compile/mingw/sigrok-cross-mingw +++ b/cross-compile/mingw/sigrok-cross-mingw @@ -53,7 +53,7 @@ GIT_CLONE="git clone --depth=1" # We need to find tools in the toolchain. export PATH=$MXE/usr/bin:$PATH -TOOLCHAIN_TRIPLET="$TARGET-w64-mingw32.static" +TOOLCHAIN_TRIPLET="$TARGET-w64-mingw32.static.posix" P="$PREFIX/lib/pkgconfig" P2="$MXE/usr/$TOOLCHAIN_TRIPLET/lib/pkgconfig" @@ -62,9 +62,9 @@ CM="-DCMAKE_TOOLCHAIN_FILE=$MXE/usr/$TOOLCHAIN_TRIPLET/share/cmake/mxe-conf.cmak L="--disable-shared --enable-static" if [ $TARGET = "i686" ]; then - export PKG_CONFIG_PATH_i686_w64_mingw32_static="$P:$P2" + export PKG_CONFIG_PATH_i686_w64_mingw32_static_posix="$P:$P2" else - export PKG_CONFIG_PATH_x86_64_w64_mingw32_static="$P:$P2" + export PKG_CONFIG_PATH_x86_64_w64_mingw32_static_posix="$P:$P2" fi # Remove build directory contents (if any) and create a new build dir.