From f44fb5b1a58090d76164a370159790c48e2e999f Mon Sep 17 00:00:00 2001 From: John Szakmeister Date: Thu, 12 Apr 2018 06:51:38 -0400 Subject: [PATCH] build/freebsd: set CMAKE_MAKE_PROGRAM iff "Unix Makefiles" (#8260) It's only appropriate to set CMAKE_MAKE_PROGRAM to gmake when we're using the "Unix Makefiles" generator. On QB, the nodes have Ninja available and will use it, which means CMAKE_GENERATOR is set to "Ninja". Setting CMAKE_MAKE_PROGRAM was forcing the build to use gmake instead of ninja, which was causing the build failure. --- third-party/cmake/BuildLuv.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/third-party/cmake/BuildLuv.cmake b/third-party/cmake/BuildLuv.cmake index 7b8ae09ec4..339264746c 100644 --- a/third-party/cmake/BuildLuv.cmake +++ b/third-party/cmake/BuildLuv.cmake @@ -86,7 +86,8 @@ else() "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_COMPILER_ARG1} ${LUV_INCLUDE_FLAGS} -fPIC") endif() -if(CMAKE_SYSTEM_NAME MATCHES ".*BSD" OR CMAKE_SYSTEM_NAME MATCHES "DragonFly") +if(CMAKE_GENERATOR MATCHES "Unix Makefiles" AND + (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 .)