Merge pull request #304 from sfo/mxe-bump

windows: Bump MXE to 2018-02-27 master
This commit is contained in:
Matt McCormick 2019-02-28 19:59:11 -05:00 committed by GitHub
commit 298f75a608
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -13,8 +13,8 @@
# ARG MXE_TARGET_THREAD= # ARG MXE_TARGET_THREAD=
# #
# mxe master 2018-09-08 # mxe master 2019-02-27
ARG MXE_GIT_TAG=842827a489087b77f51554655c0d4f48ddebd5a5 ARG MXE_GIT_TAG=2ce5587c94fc355b2c826c786a3ee018479d88d1
ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/${MXE_TARGET_ARCH}-w64-mingw32.static${MXE_TARGET_THREAD}/share/cmake/mxe-conf.cmake ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/${MXE_TARGET_ARCH}-w64-mingw32.static${MXE_TARGET_THREAD}/share/cmake/mxe-conf.cmake
@ -50,6 +50,7 @@ RUN \
libssl-dev \ libssl-dev \
libxml-parser-perl \ libxml-parser-perl \
libc6-dev-i386 \ libc6-dev-i386 \
lzip \
make \ make \
openssl \ openssl \
p7zip-full \ p7zip-full \