aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Szakmeister <john@szakmeister.net>2015-03-02 04:58:44 -0500
committerJohn Szakmeister <john@szakmeister.net>2015-03-02 04:58:44 -0500
commit6b7ece6cc89aa35f99d6bd3c078114a7a8a2daa1 (patch)
treefbe4882821481e622150038bd6e5b3aaad966962
parentea35062589142459ca657f3977d76636bf9bd29d (diff)
parenta4b96f2f1186e8be2b8ad968d670623babb48f96 (diff)
downloadrneovim-6b7ece6cc89aa35f99d6bd3c078114a7a8a2daa1.tar.gz
rneovim-6b7ece6cc89aa35f99d6bd3c078114a7a8a2daa1.tar.bz2
rneovim-6b7ece6cc89aa35f99d6bd3c078114a7a8a2daa1.zip
Merge pull request #2083 from fwalch/fix-deps-32
deps: Fix building 32-bit Lua rocks.
-rw-r--r--third-party/CMakeLists.txt24
1 files changed, 16 insertions, 8 deletions
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
index f11cbc4b7a..f067f2bfe2 100644
--- a/third-party/CMakeLists.txt
+++ b/third-party/CMakeLists.txt
@@ -240,14 +240,22 @@ if(USE_BUNDLED_LUAROCKS)
endif()
add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/stable-busted-deps
- COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install lua_cliargs 2.3-3
- COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install luafilesystem 1.6.3-1
- COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install dkjson 2.5-1
- COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install say 1.2-1
- COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install luassert 1.7.2-0
- COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install ansicolors 1.0.2-3
- COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install penlight 1.0.0-1
- COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install mediator_lua 1.1-3
+ COMMAND ${DEPS_BIN_DIR}/luarocks
+ ARGS build lua_cliargs 2.3-3 CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER}
+ COMMAND ${DEPS_BIN_DIR}/luarocks
+ ARGS build luafilesystem 1.6.3-1 CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER}
+ COMMAND ${DEPS_BIN_DIR}/luarocks
+ ARGS build dkjson 2.5-1 CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER}
+ COMMAND ${DEPS_BIN_DIR}/luarocks
+ ARGS build say 1.2-1 CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER}
+ COMMAND ${DEPS_BIN_DIR}/luarocks
+ ARGS build luassert 1.7.2-0 CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER}
+ COMMAND ${DEPS_BIN_DIR}/luarocks
+ ARGS build ansicolors 1.0.2-3 CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER}
+ COMMAND ${DEPS_BIN_DIR}/luarocks
+ ARGS build penlight 1.0.0-1 CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER}
+ COMMAND ${DEPS_BIN_DIR}/luarocks
+ ARGS build mediator_lua 1.1-3 CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER}
COMMAND touch ${DEPS_LIB_DIR}/luarocks/rocks/stable-busted-deps
DEPENDS luarocks)
add_custom_target(stable-busted-deps