Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-09-20 10:40:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #355 from haampie/feature-bump-mxe

Browse Source 
Bump MXE version 1
This commit is contained in:
Matt McCormick 2019-12-15 18:32:26 -05:00 committed by GitHub
commit 0c64605b67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common.windows
View File

@ -15,8 +15,8 @@
# ARG MXE_TARGET_LINK=shared # ARG MXE_TARGET_LINK=shared
# #
# mxe master 2019-02-27 # mxe master 2019-06-17
ARG MXE_GIT_TAG=2ce5587c94fc355b2c826c786a3ee018479d88d1 ARG MXE_GIT_TAG=0567f17d34463abda1790957812c54e8c0cf59fe
ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}/share/cmake/mxe-conf.cmake ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}/share/cmake/mxe-conf.cmake
@ -87,6 +87,7 @@ RUN \
# #
cd /usr/src/mxe && \ cd /usr/src/mxe && \
echo "MXE_TARGETS := ${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}" > settings.mk && \ echo "MXE_TARGETS := ${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}" > settings.mk && \
echo "MXE_USE_CCACHE :=" >> settings.mk && \
echo "LOCAL_PKG_LIST := cc cmake" >> settings.mk && \ echo "LOCAL_PKG_LIST := cc cmake" >> settings.mk && \
echo ".DEFAULT local-pkg-list:" >> settings.mk && \ echo ".DEFAULT local-pkg-list:" >> settings.mk && \
echo "local-pkg-list: \$(LOCAL_PKG_LIST)" >> settings.mk && \ echo "local-pkg-list: \$(LOCAL_PKG_LIST)" >> settings.mk && \
@ -94,7 +95,7 @@ RUN \
# Build MXE # Build MXE
# #
cd /usr/src/mxe && \ cd /usr/src/mxe && \
make -j$(nproc) && \ make JOBS=$(nproc) && \
# #
# Cleanup: By keeping the MXE build system (Makefile, ...), derived images will be able to install # Cleanup: By keeping the MXE build system (Makefile, ...), derived images will be able to install
# additional packages. # additional packages.