[llvm] r322032 - [cmake] Pass CMAKE_MAKE_PROGRAM to native configure

[Shoaib Meenai via llvm-commits]

Author: smeenai
Date: Mon Jan  8 13:52:58 2018
New Revision: 322032

URL: http://llvm.org/viewvc/llvm-project?rev=322032&view=rev
Log:
[cmake] Pass CMAKE_MAKE_PROGRAM to native configure

If the make program isn't in the path, the native configure will fail.
Pass CMAKE_MAKE_PROGRAM to the native configure explicitly to remedy
this, similar to what's already done for external project configuration.
Explicitly set CMAKE_MAKE_PROGRAM before the user flags so that they can
override it for the native build if they desire (though I can't fathom
why that would be useful).

Modified:
    llvm/trunk/cmake/modules/CrossCompile.cmake

Modified: llvm/trunk/cmake/modules/CrossCompile.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/CrossCompile.cmake?rev=322032&r1=322031&r2=322032&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/CrossCompile.cmake (original)
+++ llvm/trunk/cmake/modules/CrossCompile.cmake Mon Jan  8 13:52:58 2018
@@ -45,6 +45,7 @@ function(llvm_create_cross_target_intern
 
   add_custom_command(OUTPUT ${LLVM_${target_name}_BUILD}/CMakeCache.txt
     COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
+        -DCMAKE_MAKE_PROGRAM="${CMAKE_MAKE_PROGRAM}"
         ${CROSS_TOOLCHAIN_FLAGS_${target_name}} ${CMAKE_SOURCE_DIR}
         -DLLVM_TARGET_IS_CROSSCOMPILE_HOST=TRUE
         -DLLVM_TARGETS_TO_BUILD="${targets_to_build_arg}"