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

dockcross: make the default image specific to each compiler

Browse Source
This commit is contained in:
Matt McCormick committed 2016-07-04 00:10:36 -04:00
1 parent aa06b9af2c
commit fdb18671e3
15 files changed
+47 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

windows-x64/Dockerfile
+5 -3
View File
@@ -57,8 +57,6 @@ COPY settings.mk /usr/src/mxe/
RUN make -j$(nproc)
ENV PATH ${PATH}:/usr/src/mxe/usr/bin
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}
ENV CROSS_TRIPLE x86_64-w64-mingw32.static
ENV AS=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-as \
AR=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-ar \
@@ -67,4 +65,8 @@ ENV AS=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-as \
CXX=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-g++ \
LD=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-ld
WORKDIR /usr/src
ENV DEFAULT_DOCKCROSS_IMAGE thewtex/cross-compiler-windows-x64
WORKDIR /build
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}