diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2011-11-02 05:03:06 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2011-11-02 05:03:06 +0000 |
| commit | 1bfc9f8ff2e585854a0c8fa6cc840cdefb9e5124 (patch) | |
| tree | b90dc947bea34a0303b0f14dd4a3cdc054f0d43d /cmake | |
| parent | 3f2b2c218faf9c08975f24629e01c28cf88f5feb (diff) | |
| download | llvm-1bfc9f8ff2e585854a0c8fa6cc840cdefb9e5124.tar.gz llvm-1bfc9f8ff2e585854a0c8fa6cc840cdefb9e5124.tar.bz2 llvm-1bfc9f8ff2e585854a0c8fa6cc840cdefb9e5124.tar.xz | |
The TableGen parts of the CMake build are seriously broken. This fixes
one aspect of them by having them use the (annoying, if not broken)
proper library dependency model for adding the LLVMTableGen library as
a dependency. This could manifest as a link order issue in the presence
of separate LLVM / Clang source builds with CMake and a linker that
really cares about such things.
Also, add the Support dependency to llvm-tblgen itself so that it
doesn't rely on TableGen's transitive Support dependency. A parallel
change for clang-tblgen will be forthcoming.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@143531 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/TableGen.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmake/modules/TableGen.cmake b/cmake/modules/TableGen.cmake index 3dc820b4ab..6fd48e2ad9 100644 --- a/cmake/modules/TableGen.cmake +++ b/cmake/modules/TableGen.cmake @@ -76,7 +76,10 @@ endif() macro(add_tablegen target project) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_TOOLS_BINARY_DIR}) + set(${target}_OLD_LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS}) + set(LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS} TableGen) add_llvm_utility(${target} ${ARGN}) + set(LLVM_LINK_COMPONENTS ${target}_OLD_LLVM_LINK_COMPONENTS) set(${project}_TABLEGEN "${target}" CACHE STRING "Native TableGen executable. Saves building one when cross-compiling.") @@ -110,7 +113,6 @@ macro(add_tablegen target project) endif() endif() - target_link_libraries(${target} LLVMSupport LLVMTableGen) if( MINGW ) target_link_libraries(${target} imagehlp psapi) if(CMAKE_SIZEOF_VOID_P MATCHES "8") |