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

base/cmake: Do not pass toolchain option when using incompatible cmake option

Browse Source 
Also revert the changes to ccmake.sh, the restriction doesn't apply to it.

Suggested-by: Matt McCormick <matt.mccormick@kitware.com>
This commit is contained in:
Jean-Christophe Fillion-Robin
2016-09-21 21:11:33 -04:00
parent ff2512b785
commit 4876f14356
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
manylinux-x64/Dockerfile.in
View File

@@ -25,5 +25,4 @@ COPY linux-x64/${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop
COPY manylinux-x64/Toolchain.cmake ${CROSS_ROOT}/../lib/
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/../lib/Toolchain.cmake
ENV DOCKCROSS_PASS_CMAKE_TOOLCHAIN_FILE 0
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux-x64