From: Keno Fischer Date: Mon, 1 Jul 2019 23:15:07 +0000 (+0000) Subject: [cmake] With utils disabled, don't build tblgen in cross mode X-Git-Tag: llvmorg-10-init~1517 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a7f00941efd740bc6eafc32307b9d92564785f85;p=platform%2Fupstream%2Fllvm.git [cmake] With utils disabled, don't build tblgen in cross mode Summary: In cross mode, we build a separate NATIVE tblgen that runs on the host and is used during the build. Separately, we have a flag that disables building all executables in utils/. Of course generally, this doesn't turn off tblgen, since we need that during the build. In cross mode, however, that tblegen is useless since we never actually use it. Furthermore, it can be actively problematic if the cross toolchain doesn't like building executables for whatever reason. And even if building executables works fine, we can at least save compile time by omitting it from the target build. There's two changes needed to make this happen: - Stop creating a dependency from the native tool to the target tool. No such dependency is required for a correct build, so I'm not entirely sure why it was there in the first place. - If utils were disabled on the CMake command line and we're in cross mode, respect that by excluding it from the install target (using EXCLUDE_FROM_ALL). Reviewers: smeenai Differential Revision: https://reviews.llvm.org/D64032 llvm-svn: 364872 --- diff --git a/llvm/cmake/modules/TableGen.cmake b/llvm/cmake/modules/TableGen.cmake index 4bd7dd8..f15a23b 100644 --- a/llvm/cmake/modules/TableGen.cmake +++ b/llvm/cmake/modules/TableGen.cmake @@ -125,7 +125,7 @@ macro(add_tablegen target project) if(LLVM_USE_HOST_TOOLS) if( ${${project}_TABLEGEN} STREQUAL "${target}" ) - build_native_tool(${target} ${project}_TABLEGEN_EXE DEPENDS ${target}) + build_native_tool(${target} ${project}_TABLEGEN_EXE) set(${project}_TABLEGEN_EXE ${${project}_TABLEGEN_EXE} PARENT_SCOPE) add_custom_target(${project}-tablegen-host DEPENDS ${${project}_TABLEGEN_EXE}) @@ -138,6 +138,12 @@ macro(add_tablegen target project) TARGET LLVM-tablegen-host) add_dependencies(${project}-tablegen-host LLVM-tablegen-host) endif() + + # If we're using the host tablegen, and utils were not requested, we have no + # need to build this tablegen. + if ( NOT LLVM_BUILD_UTILS ) + set_target_properties(${target} PROPERTIES EXCLUDE_FROM_ALL ON) + endif() endif() endif()