aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago de Arruda <tpadilha84@gmail.com>2016-04-10 23:49:28 -0300
committerThiago de Arruda <tpadilha84@gmail.com>2016-04-11 23:07:52 -0300
commit10a8bb02acabe2c3a0d7cd2e9d8462e0228769a1 (patch)
treee1e6ab43573e24569fb11c5e64e644a7500dd4c0
parent4ae7acd152497560491322dd42087f6ddcf7c3a4 (diff)
downloadrneovim-10a8bb02acabe2c3a0d7cd2e9d8462e0228769a1.tar.gz
rneovim-10a8bb02acabe2c3a0d7cd2e9d8462e0228769a1.tar.bz2
rneovim-10a8bb02acabe2c3a0d7cd2e9d8462e0228769a1.zip
third-party: Add missing *_host dependencies to luarocks packages
-rw-r--r--third-party/cmake/BuildLuarocks.cmake9
1 files changed, 8 insertions, 1 deletions
diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake
index 8181fa5ece..8427ca87b4 100644
--- a/third-party/cmake/BuildLuarocks.cmake
+++ b/third-party/cmake/BuildLuarocks.cmake
@@ -89,6 +89,9 @@ list(APPEND THIRD_PARTY_DEPS luarocks)
if(USE_BUNDLED_LUAJIT)
add_dependencies(luarocks luajit)
+ if(MINGW AND CMAKE_CROSSCOMPILING)
+ add_dependencies(luarocks luajit_host)
+ endif()
endif()
# Each target depends on the previous module, this serializes all calls to
@@ -128,11 +131,15 @@ if(USE_BUNDLED_BUSTED)
add_custom_target(luacheck
DEPENDS ${HOSTDEPS_BIN_DIR}/luacheck)
+ set(LUV_DEPS luacheck luv-static)
+ if(MINGW AND CMAKE_CROSSCOMPILING)
+ set(LUV_DEPS ${LUV_DEPS} libuv_host)
+ endif()
add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/luv
COMMAND ${LUAROCKS_BINARY}
ARGS make ${LUAROCKS_BUILDARGS} LIBUV_DIR=${HOSTDEPS_INSTALL_DIR} CFLAGS='-O0 -g3 -fPIC'
WORKING_DIRECTORY ${DEPS_BUILD_DIR}/src/luv
- DEPENDS luacheck luv-static)
+ DEPENDS ${LUV_DEPS})
add_custom_target(luv
DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/luv)