From: Jonas Hahnfeld Date: Wed, 8 Nov 2017 14:31:54 +0000 (+0000) Subject: [CMake] Remove target to build native tablegen X-Git-Tag: llvmorg-6.0.0-rc1~3884 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0a41be758c1ac705a176c3a0d08d8f1643829b75;p=platform%2Fupstream%2Fllvm.git [CMake] Remove target to build native tablegen This was once needed so that multiple tablegen binaries don't compile the library concurrently. However, this isn't needed anymore since adding USES_TERMINAL to the custom_command. This is supported by the fact that the target was only building LLVMSupport since some cleanups a year ago. If this dependency had really been needed, we would have seen complaints. Differential Revision: https://reviews.llvm.org/D39299 llvm-svn: 317695 --- diff --git a/llvm/cmake/modules/TableGen.cmake b/llvm/cmake/modules/TableGen.cmake index 7f17f70..95de53a 100644 --- a/llvm/cmake/modules/TableGen.cmake +++ b/llvm/cmake/modules/TableGen.cmake @@ -110,19 +110,6 @@ function(add_public_tablegen_target target) set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} ${target} PARENT_SCOPE) endfunction() -if(LLVM_USE_HOST_TOOLS AND NOT TARGET NATIVE_LIB_LLVMTABLEGEN) - llvm_ExternalProject_BuildCmd(tblgen_build_cmd LLVMSupport - ${LLVM_NATIVE_BUILD} - CONFIGURATION Release) - add_custom_command(OUTPUT LIB_LLVMTABLEGEN - COMMAND ${tblgen_build_cmd} - DEPENDS CONFIGURE_LLVM_NATIVE - WORKING_DIRECTORY ${LLVM_NATIVE_BUILD} - COMMENT "Building libLLVMTableGen for native TableGen..." - USES_TERMINAL) - add_custom_target(NATIVE_LIB_LLVMTABLEGEN DEPENDS LIB_LLVMTABLEGEN) -endif() - macro(add_tablegen target project) set(${target}_OLD_LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS}) set(LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS} TableGen) @@ -166,7 +153,7 @@ macro(add_tablegen target project) CONFIGURATION Release) add_custom_command(OUTPUT ${${project}_TABLEGEN_EXE} COMMAND ${tblgen_build_cmd} - DEPENDS ${target} NATIVE_LIB_LLVMTABLEGEN + DEPENDS CONFIGURE_LLVM_NATIVE ${target} WORKING_DIRECTORY ${LLVM_NATIVE_BUILD} COMMENT "Building native TableGen..." USES_TERMINAL)