aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Szakmeister <john@szakmeister.net>2015-11-10 08:08:04 -0500
committerJohn Szakmeister <john@szakmeister.net>2015-11-10 08:08:04 -0500
commit421da79d3083b3fdb8d9c99c259e0e2d985e91c8 (patch)
treef8a108d65b711a5427c3bc5ba6e1bcd49d2ccb7c
parent68255df9b93e1b69ac5402d193abfceca04ffb54 (diff)
parent97bb24d4e5ab3d296a37e711e3f6553700c84605 (diff)
downloadrneovim-421da79d3083b3fdb8d9c99c259e0e2d985e91c8.tar.gz
rneovim-421da79d3083b3fdb8d9c99c259e0e2d985e91c8.tar.bz2
rneovim-421da79d3083b3fdb8d9c99c259e0e2d985e91c8.zip
Merge pull request #3643 from jszakmeister/enable-verbose-builds
third-party: enable verbose builds of luajit and libuv
-rw-r--r--third-party/cmake/BuildLibuv.cmake6
-rw-r--r--third-party/cmake/BuildLuajit.cmake2
2 files changed, 5 insertions, 3 deletions
diff --git a/third-party/cmake/BuildLibuv.cmake b/third-party/cmake/BuildLibuv.cmake
index 2919d289cc..5debe5c071 100644
--- a/third-party/cmake/BuildLibuv.cmake
+++ b/third-party/cmake/BuildLibuv.cmake
@@ -43,18 +43,18 @@ set(UNIX_CFGCMD sh ${DEPS_BUILD_DIR}/src/libuv/autogen.sh &&
if(UNIX)
BuildLibUv(
CONFIGURE_COMMAND ${UNIX_CFGCMD}
- INSTALL_COMMAND ${MAKE_PRG} install)
+ 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} install)
+ INSTALL_COMMAND ${MAKE_PRG} V=1 install)
# Build libuv for the target
BuildLibUv(
CONFIGURE_COMMAND ${UNIX_CFGCMD} --host=${CROSS_TARGET}
- INSTALL_COMMAND ${MAKE_PRG} install)
+ INSTALL_COMMAND ${MAKE_PRG} V=1 install)
elseif(WIN32 AND MSVC)
diff --git a/third-party/cmake/BuildLuajit.cmake b/third-party/cmake/BuildLuajit.cmake
index 3598b00c04..83aceecb59 100644
--- a/third-party/cmake/BuildLuajit.cmake
+++ b/third-party/cmake/BuildLuajit.cmake
@@ -41,6 +41,7 @@ set(INSTALLCMD_UNIX ${MAKE_PRG} CFLAGS=-fPIC
CFLAGS+=-DLUA_USE_ASSERT
CCDEBUG+=-g
BUILDMODE=static
+ Q=
install)
if(UNIX)
@@ -67,6 +68,7 @@ elseif(MINGW AND CMAKE_CROSSCOMPILING)
HOST_CC=${HOST_C_COMPILER} HOST_CFLAGS=${HOST_C_FLAGS}
HOST_LDFLAGS=${HOST_EXE_LINKER_FLAGS}
FILE_T=luajit.exe
+ Q=
INSTALL_TSYMNAME=luajit.exe)
elseif(WIN32 AND MSVC)