Merge pull request #3643 from jszakmeister/enable-verbose-builds

third-party: enable verbose builds of luajit and libuv
This commit is contained in:
John Szakmeister 2015-11-10 08:08:04 -05:00
commit 421da79d30
2 changed files with 5 additions and 3 deletions

View File

@ -43,18 +43,18 @@ set(UNIX_CFGCMD sh ${DEPS_BUILD_DIR}/src/libuv/autogen.sh &&
if(UNIX) if(UNIX)
BuildLibUv( BuildLibUv(
CONFIGURE_COMMAND ${UNIX_CFGCMD} CONFIGURE_COMMAND ${UNIX_CFGCMD}
INSTALL_COMMAND ${MAKE_PRG} install) INSTALL_COMMAND ${MAKE_PRG} V=1 install)
elseif(MINGW AND CMAKE_CROSSCOMPILING) elseif(MINGW AND CMAKE_CROSSCOMPILING)
# Build libuv for the host # Build libuv for the host
BuildLibUv(TARGET libuv_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} 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 # Build libuv for the target
BuildLibUv( BuildLibUv(
CONFIGURE_COMMAND ${UNIX_CFGCMD} --host=${CROSS_TARGET} CONFIGURE_COMMAND ${UNIX_CFGCMD} --host=${CROSS_TARGET}
INSTALL_COMMAND ${MAKE_PRG} install) INSTALL_COMMAND ${MAKE_PRG} V=1 install)
elseif(WIN32 AND MSVC) elseif(WIN32 AND MSVC)

View File

@ -41,6 +41,7 @@ set(INSTALLCMD_UNIX ${MAKE_PRG} CFLAGS=-fPIC
CFLAGS+=-DLUA_USE_ASSERT CFLAGS+=-DLUA_USE_ASSERT
CCDEBUG+=-g CCDEBUG+=-g
BUILDMODE=static BUILDMODE=static
Q=
install) install)
if(UNIX) if(UNIX)
@ -67,6 +68,7 @@ elseif(MINGW AND CMAKE_CROSSCOMPILING)
HOST_CC=${HOST_C_COMPILER} HOST_CFLAGS=${HOST_C_FLAGS} HOST_CC=${HOST_C_COMPILER} HOST_CFLAGS=${HOST_C_FLAGS}
HOST_LDFLAGS=${HOST_EXE_LINKER_FLAGS} HOST_LDFLAGS=${HOST_EXE_LINKER_FLAGS}
FILE_T=luajit.exe FILE_T=luajit.exe
Q=
INSTALL_TSYMNAME=luajit.exe) INSTALL_TSYMNAME=luajit.exe)
elseif(WIN32 AND MSVC) elseif(WIN32 AND MSVC)