From 856ef6016e00e4688cb0aa0a8a7ed3bb51e8ff2d Mon Sep 17 00:00:00 2001 From: Francois Budin Date: Fri, 13 Apr 2018 14:53:21 -0400 Subject: [PATCH] BUG: Remove cpack symbolic link before creating the new link --- windows-x64/Dockerfile | 1 + windows-x86/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/windows-x64/Dockerfile b/windows-x64/Dockerfile index 1ccfb65..f3e5fbf 100644 --- a/windows-x64/Dockerfile +++ b/windows-x64/Dockerfile @@ -72,6 +72,7 @@ ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/x86_64-w64-mingw32.static/share/cmake/ RUN echo 'set(CMAKE_CROSSCOMPILING_EMULATOR "/usr/bin/wine")' >> ${CMAKE_TOOLCHAIN_FILE} RUN cd /usr/local/bin \ && rm cmake \ + && rm cpack \ && 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 diff --git a/windows-x86/Dockerfile b/windows-x86/Dockerfile index fbe064d..8075f23 100644 --- a/windows-x86/Dockerfile +++ b/windows-x86/Dockerfile @@ -72,6 +72,7 @@ ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/i686-w64-mingw32.static/share/cmake/mx RUN echo 'set(CMAKE_CROSSCOMPILING_EMULATOR "/usr/bin/wine")' >> ${CMAKE_TOOLCHAIN_FILE} RUN cd /usr/local/bin \ && rm cmake \ + && rm cpack \ && 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