diff options
| author | Dundar Goc <gocdundar@gmail.com> | 2022-05-17 15:08:24 +0200 |
|---|---|---|
| committer | Dundar Goc <gocdundar@gmail.com> | 2022-05-17 17:07:45 +0200 |
| commit | a4c0c0704308ee18e3a23954c07666f36cfbb930 (patch) | |
| tree | 35564bf974d20d3e3d7e4490f491bcdd209503ac /third-party/cmake/BuildLibuv.cmake | |
| parent | f49699737c9b24e1af52719974cf3bc770539ef9 (diff) | |
| download | rneovim-a4c0c0704308ee18e3a23954c07666f36cfbb930.tar.gz rneovim-a4c0c0704308ee18e3a23954c07666f36cfbb930.tar.bz2 rneovim-a4c0c0704308ee18e3a23954c07666f36cfbb930.zip | |
revert: "ci: remove mingw job #18580"
This partially reverts commit f8af81445bb48966d54f4a956842d935d009d275.
The mingw parts of cmake was removed to see if it was still used
(ref: https://github.com/neovim/neovim/pull/18580). It turns out it is,
so this will fix that.
Closes: https://github.com/neovim/neovim/issues/18597
Diffstat (limited to 'third-party/cmake/BuildLibuv.cmake')
| -rw-r--r-- | third-party/cmake/BuildLibuv.cmake | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/third-party/cmake/BuildLibuv.cmake b/third-party/cmake/BuildLibuv.cmake index 9d0707201f..42650308a8 100644 --- a/third-party/cmake/BuildLibuv.cmake +++ b/third-party/cmake/BuildLibuv.cmake @@ -45,11 +45,24 @@ if(UNIX) CONFIGURE_COMMAND ${UNIX_CFGCMD} MAKE=${MAKE_PRG} INSTALL_COMMAND ${MAKE_PRG} V=1 install) +elseif(MINGW AND CMAKE_CROSSCOMPILING) + # Build libuv for the host + BuildLibuv(TARGET libuv_host + CONFIGURE_COMMAND sh ${DEPS_BUILD_DIR}/src/libuv_host/autogen.sh && ${DEPS_BUILD_DIR}/src/libuv_host/configure --with-pic --disable-shared --prefix=${HOSTDEPS_INSTALL_DIR} CC=${HOST_C_COMPILER} + INSTALL_COMMAND ${MAKE_PRG} V=1 install) + + # Build libuv for the target + BuildLibuv( + CONFIGURE_COMMAND ${UNIX_CFGCMD} --host=${CROSS_TARGET} + INSTALL_COMMAND ${MAKE_PRG} V=1 install) + elseif(WIN32) set(UV_OUTPUT_DIR ${DEPS_BUILD_DIR}/src/libuv/${CMAKE_BUILD_TYPE}) if(MSVC) set(BUILD_SHARED ON) + elseif(MINGW) + set(BUILD_SHARED OFF) else() message(FATAL_ERROR "Trying to build libuv in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}") endif() |