summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Stellard <tstellar@redhat.com>2017-03-09 19:24:07 +0000
committerTom Stellard <tstellar@redhat.com>2017-03-09 19:24:07 +0000
commiteef294c961bb1794b285edec3a7d98b40aed9434 (patch)
tree4aadf90c55f186034befedf5a8f88466a69055fe
parentf5fce486797d49b82660fef841b57d49c007dab1 (diff)
downloadbcm5719-llvm-eef294c961bb1794b285edec3a7d98b40aed9434.tar.gz
bcm5719-llvm-eef294c961bb1794b285edec3a7d98b40aed9434.zip
CMake: Don't install llvm-tblgen twice
Summary: The add_tablegen macros defines its own install target, and it was also calling add_llvm_utility which adds another install target. Configuring with -DLLVM_TOOLS_INSTALL_DIR set to something other than 'bin' along with -DLLVM_INSTALL_UTILS=ON was causing llvm-tablgen to be installed to two separate directories. Reviewers: beanz, hans Reviewed By: beanz Subscribers: llvm-commits, mgorny Differential Revision: https://reviews.llvm.org/D30656 llvm-svn: 297403
-rw-r--r--llvm/cmake/modules/TableGen.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/cmake/modules/TableGen.cmake b/llvm/cmake/modules/TableGen.cmake
index 0c00bf5e686..da0858e54d4 100644
--- a/llvm/cmake/modules/TableGen.cmake
+++ b/llvm/cmake/modules/TableGen.cmake
@@ -99,7 +99,7 @@ macro(add_tablegen target project)
set(LLVM_ENABLE_OBJLIB ON)
endif()
- add_llvm_utility(${target} ${ARGN})
+ add_llvm_executable(${target} DISABLE_LLVM_LINK_LLVM_DYLIB ${ARGN})
set(LLVM_LINK_COMPONENTS ${${target}_OLD_LLVM_LINK_COMPONENTS})
set(${project}_TABLEGEN "${target}" CACHE
OpenPOWER on IntegriCloud