From: Mehdi Amini Date: Fri, 11 Nov 2016 04:27:59 +0000 (+0000) Subject: CMake: make LLVM_OPTIMIZED_TABLEGEN friendly with LLVM_EXTERNAL_CLANG_SOURCE_DIR X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=90ab4b2ee258f6437f0bea77db22fcb86d5c66d9;p=llvm CMake: make LLVM_OPTIMIZED_TABLEGEN friendly with LLVM_EXTERNAL_CLANG_SOURCE_DIR This is need because of clang-tblgen Differential Revision: https://reviews.llvm.org/D26483 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@286560 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/cmake/modules/CrossCompile.cmake b/cmake/modules/CrossCompile.cmake index 9c598a6a07b..b0726ebd4de 100644 --- a/cmake/modules/CrossCompile.cmake +++ b/cmake/modules/CrossCompile.cmake @@ -41,10 +41,15 @@ function(llvm_create_cross_target_internal target_name toolchain buildtype) 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})