mirror of
https://github.com/bensuperpc/dockcross.git
synced 2025-04-04 13:09:15 +02:00
Merge pull request #260 from Gjacquenot/master
[windows] Updated mxe repo for future access to gcc8
This commit is contained in:
commit
96dd0feb4c
@ -13,8 +13,8 @@
|
|||||||
# ARG MXE_TARGET_THREAD=
|
# ARG MXE_TARGET_THREAD=
|
||||||
#
|
#
|
||||||
|
|
||||||
# mxe master 2017-10-25
|
# mxe master 2018-09-08
|
||||||
ARG MXE_GIT_TAG=994ad47302e8811614b7eb49fc05234942b95b89
|
ARG MXE_GIT_TAG=842827a489087b77f51554655c0d4f48ddebd5a5
|
||||||
|
|
||||||
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
|
||||||
|
|
||||||
@ -84,7 +84,7 @@ RUN \
|
|||||||
#
|
#
|
||||||
cd /usr/src/mxe && \
|
cd /usr/src/mxe && \
|
||||||
echo "MXE_TARGETS := ${MXE_TARGET_ARCH}-w64-mingw32.static${MXE_TARGET_THREAD}" > settings.mk && \
|
echo "MXE_TARGETS := ${MXE_TARGET_ARCH}-w64-mingw32.static${MXE_TARGET_THREAD}" > settings.mk && \
|
||||||
echo "LOCAL_PKG_LIST := gcc" >> 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 && \
|
||||||
#
|
#
|
||||||
|
Loading…
x
Reference in New Issue
Block a user