From a2a83e07db6ff089845b3deec541496e1c745ff7 Mon Sep 17 00:00:00 2001 From: Chris Bieneman Date: Wed, 9 Dec 2015 22:46:25 +0000 Subject: [PATCH] [CMake] Pass CMAKE_MAKE_PROGRAM through to compiler-rt build. This is needed if your make tool is overridden. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@255172 91177308-0d34-0410-b5e6-96231b3b80d8 --- runtime/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index f68f25b0fd..1443580fa5 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -64,6 +64,7 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/) -DCMAKE_C_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang -DCMAKE_CXX_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang++ -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} -DLLVM_CONFIG_PATH=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-config -DCOMPILER_RT_OUTPUT_DIR=${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION} -DCOMPILER_RT_EXEC_OUTPUT_DIR=${LLVM_RUNTIME_OUTPUT_INTDIR} -- 2.50.1