Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-01-22 22:25:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

windows-{x64,x86}: Bump MXE to 2017-10-25 master

Browse Source 
MXE now ships its own version of CMake that sources the toolchain file,
etc. As suggested by their warning when sourcing the toolchain file, use
it.

This also results in updating GCC from 4.9 to 5.4.
This commit is contained in:
Matt McCormick 2017-10-25 12:13:05 -04:00
parent 6a15a7aa24
commit 07e5aecff3
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
windows-x64/Dockerfile
View File

@ -48,10 +48,10 @@ ENV WINEARCH win64
RUN wine hostname RUN wine hostname
WORKDIR /usr/src WORKDIR /usr/src
# mxe master 2016-10-25 # mxe master 2017-10-25
RUN git clone https://github.com/mxe/mxe.git && \ RUN git clone https://github.com/mxe/mxe.git && \
cd mxe && \ cd mxe && \
git checkout 2c8b747d9cf58672040ff7443d2c365dba978fa5 git checkout 994ad47302e8811614b7eb49fc05234942b95b89
WORKDIR /usr/src/mxe WORKDIR /usr/src/mxe
COPY settings.mk /usr/src/mxe/ COPY settings.mk /usr/src/mxe/
RUN make -j$(nproc) RUN make -j$(nproc)
@ -70,6 +70,10 @@ WORKDIR /work
ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/x86_64-w64-mingw32.static/share/cmake/mxe-conf.cmake ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/x86_64-w64-mingw32.static/share/cmake/mxe-conf.cmake
RUN echo 'set(CMAKE_CROSSCOMPILING_EMULATOR "/usr/bin/wine")' >> ${CMAKE_TOOLCHAIN_FILE} RUN echo 'set(CMAKE_CROSSCOMPILING_EMULATOR "/usr/bin/wine")' >> ${CMAKE_TOOLCHAIN_FILE}
RUN cd /usr/local/bin \
&& rm cmake \
&& ln -s /usr/src/mxe/usr/bin/x86_64-w64-mingw32.static-cmake cmake \
&& ln -s /usr/src/mxe/usr/bin/x86_64-w64-mingw32.static-cpack cpack
# Build-time metadata as defined at http://label-schema.org # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE

8
windows-x86/Dockerfile
View File

@ -48,10 +48,10 @@ ENV WINEARCH win32
RUN wine hostname RUN wine hostname
WORKDIR /usr/src WORKDIR /usr/src
# mxe master 2016-10-25 # mxe master 2017-10-25
RUN git clone https://github.com/mxe/mxe.git && \ RUN git clone https://github.com/mxe/mxe.git && \
cd mxe && \ cd mxe && \
git checkout 2c8b747d9cf58672040ff7443d2c365dba978fa5 git checkout 994ad47302e8811614b7eb49fc05234942b95b89
WORKDIR /usr/src/mxe WORKDIR /usr/src/mxe
COPY settings.mk /usr/src/mxe/ COPY settings.mk /usr/src/mxe/
RUN make -j$(nproc) RUN make -j$(nproc)
@ -70,6 +70,10 @@ WORKDIR /work
ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/i686-w64-mingw32.static/share/cmake/mxe-conf.cmake ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/i686-w64-mingw32.static/share/cmake/mxe-conf.cmake
RUN echo 'set(CMAKE_CROSSCOMPILING_EMULATOR "/usr/bin/wine")' >> ${CMAKE_TOOLCHAIN_FILE} RUN echo 'set(CMAKE_CROSSCOMPILING_EMULATOR "/usr/bin/wine")' >> ${CMAKE_TOOLCHAIN_FILE}
RUN cd /usr/local/bin \
&& rm cmake \
&& ln -s /usr/src/mxe/usr/bin/i686-w64-mingw32.static-cmake cmake \
&& ln -s /usr/src/mxe/usr/bin/i686-w64-mingw32.static-cpack cpack
# Build-time metadata as defined at http://label-schema.org # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE