summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorShoaib Meenai <smeenai@fb.com>2017-12-05 21:49:56 +0000
committerShoaib Meenai <smeenai@fb.com>2017-12-05 21:49:56 +0000
commit4a6bb5316a70ee5df350bd8617ce7dcbd569a4ae (patch)
treef439c94195f4e99be213464fb425dd47763ae190 /tools
parent96cfeb34745e61ec68d8835c83b9a93a0ddaf8aa (diff)
[CMake] Use PRIVATE in target_link_libraries for executables
We currently use target_link_libraries without an explicit scope specifier (INTERFACE, PRIVATE or PUBLIC) when linking executables. Dependencies added in this way apply to both the target and its dependencies, i.e. they become part of the executable's link interface and are transitive. Transitive dependencies generally don't make sense for executables, since you wouldn't normally be linking against an executable. This also causes issues for generating install export files when using LLVM_DISTRIBUTION_COMPONENTS. For example, clang has a lot of LLVM library dependencies, which are currently added as interface dependencies. If clang is in the distribution components but the LLVM libraries it depends on aren't (which is a perfectly legitimate use case if the LLVM libraries are being built static and there are therefore no run-time dependencies on them), CMake will complain about the LLVM libraries not being in export set when attempting to generate the install export file for clang. This is reasonable behavior on CMake's part, and the right thing is for LLVM's build system to explicitly use PRIVATE dependencies for executables. Unfortunately, CMake doesn't allow you to mix and match the keyword and non-keyword target_link_libraries signatures for a single target; i.e., if a single call to target_link_libraries for a particular target uses one of the INTERFACE, PRIVATE, or PUBLIC keywords, all other calls must also be updated to use those keywords. This means we must do this change in a single shot. I also fully expect to have missed some instances; I tested by enabling all the projects in the monorepo (except dragonegg), and configuring both with and without shared libraries, on both Darwin and Linux, but I'm planning to rely on the buildbots for other configurations (since it should be pretty easy to fix those). Even after this change, we still have a lot of target_link_libraries calls that don't specify a scope keyword, mostly for shared libraries. I'm thinking about addressing those in a follow-up, but that's a separate change IMO. Differential Revision: https://reviews.llvm.org/D40823 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@319840 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
-rw-r--r--tools/bugpoint/CMakeLists.txt4
-rw-r--r--tools/dsymutil/CMakeLists.txt2
-rw-r--r--tools/llvm-cfi-verify/CMakeLists.txt2
-rw-r--r--tools/llvm-objdump/CMakeLists.txt2
-rw-r--r--tools/opt/CMakeLists.txt2
5 files changed, 6 insertions, 6 deletions
diff --git a/tools/bugpoint/CMakeLists.txt b/tools/bugpoint/CMakeLists.txt
index 8975e676343..72c597379c8 100644
--- a/tools/bugpoint/CMakeLists.txt
+++ b/tools/bugpoint/CMakeLists.txt
@@ -37,7 +37,7 @@ add_llvm_tool(bugpoint
export_executable_symbols(bugpoint)
if(WITH_POLLY AND LINK_POLLY_INTO_TOOLS)
- target_link_libraries(bugpoint Polly)
+ target_link_libraries(bugpoint PRIVATE Polly)
# Ensure LLVMTarget can resolve dependences in Polly.
- target_link_libraries(bugpoint LLVMTarget)
+ target_link_libraries(bugpoint PRIVATE LLVMTarget)
endif(WITH_POLLY AND LINK_POLLY_INTO_TOOLS)
diff --git a/tools/dsymutil/CMakeLists.txt b/tools/dsymutil/CMakeLists.txt
index 61d78b5094a..1dcb2116f34 100644
--- a/tools/dsymutil/CMakeLists.txt
+++ b/tools/dsymutil/CMakeLists.txt
@@ -22,5 +22,5 @@ add_llvm_tool(llvm-dsymutil
)
IF(APPLE)
- target_link_libraries(llvm-dsymutil "-framework CoreFoundation")
+ target_link_libraries(llvm-dsymutil PRIVATE "-framework CoreFoundation")
ENDIF(APPLE)
diff --git a/tools/llvm-cfi-verify/CMakeLists.txt b/tools/llvm-cfi-verify/CMakeLists.txt
index de6a46e7859..7a008a66770 100644
--- a/tools/llvm-cfi-verify/CMakeLists.txt
+++ b/tools/llvm-cfi-verify/CMakeLists.txt
@@ -15,4 +15,4 @@ add_llvm_tool(llvm-cfi-verify
llvm-cfi-verify.cpp)
add_subdirectory(lib)
-target_link_libraries(llvm-cfi-verify LLVMCFIVerify)
+target_link_libraries(llvm-cfi-verify PRIVATE LLVMCFIVerify)
diff --git a/tools/llvm-objdump/CMakeLists.txt b/tools/llvm-objdump/CMakeLists.txt
index 043a181d639..177c98166ef 100644
--- a/tools/llvm-objdump/CMakeLists.txt
+++ b/tools/llvm-objdump/CMakeLists.txt
@@ -23,7 +23,7 @@ add_llvm_tool(llvm-objdump
)
if(HAVE_LIBXAR)
- target_link_libraries(llvm-objdump ${XAR_LIB})
+ target_link_libraries(llvm-objdump PRIVATE ${XAR_LIB})
endif()
if(LLVM_INSTALL_BINUTILS_SYMLINKS)
diff --git a/tools/opt/CMakeLists.txt b/tools/opt/CMakeLists.txt
index 518396e3602..fcc957abaee 100644
--- a/tools/opt/CMakeLists.txt
+++ b/tools/opt/CMakeLists.txt
@@ -37,5 +37,5 @@ add_llvm_tool(opt
export_executable_symbols(opt)
if(WITH_POLLY AND LINK_POLLY_INTO_TOOLS)
- target_link_libraries(opt Polly)
+ target_link_libraries(opt PRIVATE Polly)
endif(WITH_POLLY AND LINK_POLLY_INTO_TOOLS)