diff options
| author | Don Hinton <hintonda@gmail.com> | 2017-12-01 20:46:45 +0000 |
|---|---|---|
| committer | Don Hinton <hintonda@gmail.com> | 2017-12-01 20:46:45 +0000 |
| commit | 8ad3e8644f2195d9109b2c91fb82a8ef8347c4c0 (patch) | |
| tree | 32cc4660be34a58528271f6f91f578967f74cfe7 /cmake | |
| parent | c4f204db88ed71acb6fd7d08b7fad70004ee8464 (diff) | |
[cmake] Revert (rL319574): Resubmit Remove redundant call to cmake when building host tools.
Still fails for some bots.
Differential Revision: https://reviews.llvm.org/D40229
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@319582 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/CrossCompile.cmake | 41 |
1 files changed, 28 insertions, 13 deletions
diff --git a/cmake/modules/CrossCompile.cmake b/cmake/modules/CrossCompile.cmake index f534a9e7ec5..8de7c2aab4f 100644 --- a/cmake/modules/CrossCompile.cmake +++ b/cmake/modules/CrossCompile.cmake @@ -12,17 +12,6 @@ function(llvm_create_cross_target_internal target_name toolchain buildtype) CACHE STRING "Toolchain file for ${target_name}") endif() - if (buildtype) - set(build_type_flags "-DCMAKE_BUILD_TYPE=${buildtype}") - endif() - if (LLVM_USE_LINKER AND NOT CMAKE_CROSSCOMPILING) - set(linker_flag "-DLLVM_USE_LINKER=${LLVM_USE_LINKER}") - endif() - if (LLVM_EXTERNAL_CLANG_SOURCE_DIR) - # Propagate LLVM_EXTERNAL_CLANG_SOURCE_DIR so that clang-tblgen can be built - set(external_clang_dir "-DLLVM_EXTERNAL_CLANG_SOURCE_DIR=${LLVM_EXTERNAL_CLANG_SOURCE_DIR}") - endif() - add_custom_command(OUTPUT ${LLVM_${target_name}_BUILD} COMMAND ${CMAKE_COMMAND} -E make_directory ${LLVM_${target_name}_BUILD} COMMENT "Creating ${LLVM_${target_name}_BUILD}...") @@ -34,8 +23,6 @@ function(llvm_create_cross_target_internal target_name toolchain buildtype) COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" ${CROSS_TOOLCHAIN_FLAGS_${target_name}} ${CMAKE_SOURCE_DIR} -DLLVM_TARGET_IS_CROSSCOMPILE_HOST=TRUE - -DLLVM_TARGETS_TO_BUILD=Native - ${build_type_flags} ${linker_flag} ${external_clang_dir} WORKING_DIRECTORY ${LLVM_${target_name}_BUILD} DEPENDS CREATE_LLVM_${target_name} COMMENT "Configuring ${target_name} LLVM...") @@ -43,6 +30,34 @@ function(llvm_create_cross_target_internal target_name toolchain buildtype) add_custom_target(CONFIGURE_LLVM_${target_name} DEPENDS ${LLVM_${target_name}_BUILD}/CMakeCache.txt) + set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES + ${LLVM_${target_name}_BUILD}) + + if(NOT IS_DIRECTORY ${LLVM_${target_name}_BUILD}) + + message(STATUS "Configuring ${target_name} build...") + execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory + ${LLVM_${target_name}_BUILD} ) + + message(STATUS "Configuring ${target_name} targets...") + if (buildtype) + set(build_type_flags "-DCMAKE_BUILD_TYPE=${buildtype}") + endif() + if (LLVM_USE_LINKER AND NOT CMAKE_CROSSCOMPILING) + set(linker_flag "-DLLVM_USE_LINKER=${LLVM_USE_LINKER}") + endif() + if (LLVM_EXTERNAL_CLANG_SOURCE_DIR) + # Propagate LLVM_EXTERNAL_CLANG_SOURCE_DIR so that clang-tblgen can be built + set(external_clang_dir "-DLLVM_EXTERNAL_CLANG_SOURCE_DIR=${LLVM_EXTERNAL_CLANG_SOURCE_DIR}") + endif() + execute_process(COMMAND ${CMAKE_COMMAND} ${build_type_flags} + -G "${CMAKE_GENERATOR}" -DLLVM_TARGETS_TO_BUILD=${LLVM_TARGETS_TO_BUILD} + ${CROSS_TOOLCHAIN_FLAGS_${target_name}} ${CMAKE_SOURCE_DIR} + -DLLVM_TARGET_IS_CROSSCOMPILE_HOST=TRUE + ${external_clang_dir} ${linker_flag} + WORKING_DIRECTORY ${LLVM_${target_name}_BUILD} ) + endif(NOT IS_DIRECTORY ${LLVM_${target_name}_BUILD}) + endfunction() function(llvm_create_cross_target target_name sysroot) |