diff options
| author | Chris Bieneman <beanz@apple.com> | 2015-03-19 16:49:44 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2015-03-19 16:49:44 +0000 |
| commit | ca4f699cc2a7b1a3b4b521dc4f7c90673c683f6d (patch) | |
| tree | 46023697b5b9c5a7b8345836318a5030b8e2b4d7 /llvm/cmake | |
| parent | 783254386e267a9957844d25b3ad697863a03c56 (diff) | |
| download | bcm5719-llvm-ca4f699cc2a7b1a3b4b521dc4f7c90673c683f6d.tar.gz bcm5719-llvm-ca4f699cc2a7b1a3b4b521dc4f7c90673c683f6d.zip | |
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
Diffstat (limited to 'llvm/cmake')
| -rw-r--r-- | llvm/cmake/modules/TableGen.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
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 $<CONFIGURATION> - 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() |
