Use mingw-w64 for 32bit Windows builds as well.

Mingw(32) is rather poorly maintaned and has quite a lot of bugs. And
because our Windows cross builds were also poorly maintained and most of
the cross-tests were broken as well, I'm just taking this step and try
to switch to mingw-w64 for everything "cross Windows".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig
2014-03-03 22:38:48 +01:00
parent ae0b5d6813
commit e64b342fa8
10 changed files with 19 additions and 29 deletions
+3 -3
View File
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
'';
crossAttrs = let
isMingwW64 = stdenv.cross.config == "x86_64-w64-mingw32";
isMingw = stdenv.cross.libc == "msvcrt";
in {
configurePhase = ''
makeFlagsArray=(
@@ -61,9 +61,9 @@ stdenv.mkDerivation rec {
RANLIB=${stdenv.cross.config}-ranlib
V=${majorVersion}
R=${version}
${stdenv.lib.optionals isMingwW64 "mingw"}
${stdenv.lib.optionals isMingw "mingw"}
)
'' + stdenv.lib.optionalString isMingwW64 ''
'' + stdenv.lib.optionalString isMingw ''
installFlagsArray=(
TO_BIN="lua.exe luac.exe"
TO_LIB="liblua.a lua52.dll"