From ca4f699cc2a7b1a3b4b521dc4f7c90673c683f6d Mon Sep 17 00:00:00 2001 From: Chris Bieneman Date: Thu, 19 Mar 2015 16:49:44 +0000 Subject: Fixing dependencies for native tablegen. The dependencies for cross-built tablegen were a bit confused. This fixes that. The following dependencies are now enforced: (1) Tablegen tasks depend on the native tablegen (2) Native tablegen depends on the cross-compiled tablegen Although the native tablegen doesn't actually require the cross tablegen, having this dependency forces the native tablegen to rebuild whenever the cross tablegen changes. llvm-svn: 232730 --- llvm/cmake/modules/TableGen.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'llvm/cmake') diff --git a/llvm/cmake/modules/TableGen.cmake b/llvm/cmake/modules/TableGen.cmake index c6568a6f941..bb0d844605f 100644 --- a/llvm/cmake/modules/TableGen.cmake +++ b/llvm/cmake/modules/TableGen.cmake @@ -97,14 +97,12 @@ macro(add_tablegen target project) set(${project}_TABLEGEN_EXE ${${project}_TABLEGEN_EXE} PARENT_SCOPE) add_custom_command(OUTPUT ${${project}_TABLEGEN_EXE} - COMMAND ${CMAKE_COMMAND} --build . --target ${target} --config $ - DEPENDS ${LLVM_NATIVE_BUILD}/CMakeCache.txt + COMMAND ${CMAKE_COMMAND} --build . --target ${target} --config Release + DEPENDS CONFIGURE_LLVM_NATIVE ${target} WORKING_DIRECTORY ${LLVM_NATIVE_BUILD} COMMENT "Building native TableGen...") add_custom_target(${project}NativeTableGen DEPENDS ${${project}_TABLEGEN_EXE}) add_dependencies(${project}NativeTableGen CONFIGURE_LLVM_NATIVE) - - add_dependencies(${target} ${project}NativeTableGen) endif() endif() -- cgit v1.2.3