IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

build/OpenBSD: force gmake (#8222)

Browse Source 
fix #8216
This commit is contained in:
Utkarsh Anand 2018-04-07 19:40:01 +05:30 committed by Justin M. Keyes
parent 2ec94eb23f
commit 1ca138f236
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
third-party/cmake/BuildGperf.cmake vendored
View File

@ -40,7 +40,7 @@ if(UNIX OR (MINGW AND CMAKE_CROSSCOMPILING))
BuildGperf(
CONFIGURE_COMMAND ${DEPS_BUILD_DIR}/src/gperf/configure
--prefix=${HOSTDEPS_INSTALL_DIR}
--prefix=${HOSTDEPS_INSTALL_DIR} MAKE=${MAKE_PRG}
INSTALL_COMMAND ${MAKE_PRG} install)
elseif(MSVC OR MINGW)
@ -61,4 +61,3 @@ elseif(MSVC OR MINGW)
else()
message(FATAL_ERROR "Trying to build gperf in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}")
endif()

2
third-party/cmake/BuildLibuv.cmake vendored
View File

@ -43,7 +43,7 @@ set(UNIX_CFGCMD sh ${DEPS_BUILD_DIR}/src/libuv/autogen.sh &&
if(UNIX)
BuildLibuv(
CONFIGURE_COMMAND ${UNIX_CFGCMD}
CONFIGURE_COMMAND ${UNIX_CFGCMD} MAKE=${MAKE_PRG}
INSTALL_COMMAND ${MAKE_PRG} V=1 install)
elseif(MINGW AND CMAKE_CROSSCOMPILING)

6
third-party/cmake/BuildLuv.cmake vendored
View File

@ -86,7 +86,11 @@ else()
"-DCMAKE_C_FLAGS:STRING=${CMAKE_C_COMPILER_ARG1} ${LUV_INCLUDE_FLAGS} -fPIC")
endif()
set(LUV_BUILD_COMMAND ${CMAKE_COMMAND} --build .)
if(CMAKE_SYSTEM_NAME MATCHES ".*BSD" OR CMAKE_SYSTEM_NAME MATCHES "DragonFly")
set(LUV_BUILD_COMMAND ${CMAKE_COMMAND} "-DCMAKE_MAKE_PROGRAM=gmake" --build .)
else()
set(LUV_BUILD_COMMAND ${CMAKE_COMMAND} --build .)
endif()
set(LUV_INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install)
BuildLuv(PATCH_COMMAND ${LUV_PATCH_COMMAND}