From: Uwe Hermann <redacted>
Date: Mon, 4 Aug 2014 14:40:26 +0000 (+0200)
Subject: sigrok-cross-mingw: Add and use $TOOLCHAIN_TRIPLET.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=2c1ce0e40366d80f00a76824caefb640bd489338;p=sigrok-util.git

sigrok-cross-mingw: Add and use $TOOLCHAIN_TRIPLET.
---

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index 1f2acd0..74ad43b 100755
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -50,12 +50,14 @@ GIT_CLONE="git clone --depth=1"
 # We need to find tools in the toolchain.
 export PATH=$MXE/usr/bin:$PATH
 
+TOOLCHAIN_TRIPLET="i686-pc-mingw32.static"
+
 P="$PREFIX/lib/pkgconfig"
-P2="$MXE/usr/i686-pc-mingw32.static/lib/pkgconfig"
-C="--host=i686-pc-mingw32.static --prefix=$PREFIX"
-CM="-DCMAKE_TOOLCHAIN_FILE=$MXE/usr/i686-pc-mingw32.static/share/cmake/mxe-conf.cmake"
+P2="$MXE/usr/$TOOLCHAIN_TRIPLET/lib/pkgconfig"
+C="--host=$TOOLCHAIN_TRIPLET --prefix=$PREFIX"
+CM="-DCMAKE_TOOLCHAIN_FILE=$MXE/usr/$TOOLCHAIN_TRIPLET/share/cmake/mxe-conf.cmake"
 L="--disable-shared --enable-static"
-DDK="$MXE/usr/i686-pc-mingw32.static/include/ddk"
+DDK="$MXE/usr/$TOOLCHAIN_TRIPLET/include/ddk"
 
 # Remove build directory contents (if any) and create a new build dir.
 rm -rf $BUILDDIR