Index: llvm/trunk/cmake/modules/CrossCompile.cmake =================================================================== --- llvm/trunk/cmake/modules/CrossCompile.cmake +++ llvm/trunk/cmake/modules/CrossCompile.cmake @@ -12,6 +12,14 @@ CACHE STRING "Toolchain file for ${target_name}") endif() + if (buildtype) + set(build_type_flags "-DCMAKE_BUILD_TYPE=${buildtype}") + 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}...") @@ -23,6 +31,8 @@ COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" ${CROSS_TOOLCHAIN_FLAGS_${target_name}} ${CMAKE_SOURCE_DIR} -DLLVM_TARGET_IS_CROSSCOMPILE_HOST=TRUE + -DLLVM_TARGETS_TO_BUILD=${LLVM_TARGETS_TO_BUILD} + ${build_type_flags} ${external_clang_dir} WORKING_DIRECTORY ${LLVM_${target_name}_BUILD} DEPENDS CREATE_LLVM_${target_name} COMMENT "Configuring ${target_name} LLVM...") @@ -30,32 +40,6 @@ 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_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} - WORKING_DIRECTORY ${LLVM_${target_name}_BUILD} ) - endif(NOT IS_DIRECTORY ${LLVM_${target_name}_BUILD}) - endfunction() function(llvm_create_cross_target target_name sysroot)