diff options
| author | Vlad Tsyrklevich <vlad@tsyrklevich.net> | 2017-10-18 04:27:53 +0000 |
|---|---|---|
| committer | Vlad Tsyrklevich <vlad@tsyrklevich.net> | 2017-10-18 04:27:53 +0000 |
| commit | 4dc1c9735b5790bac59c13edede3e34b326ed0c2 (patch) | |
| tree | aabbdd1de11099b8c50d04eca4327fba461eac65 /llvm/unittests/tools/llvm-cfi-verify | |
| parent | 3038c6beb59555ef86618f4d69ed187e28022b57 (diff) | |
| download | bcm5719-llvm-4dc1c9735b5790bac59c13edede3e34b326ed0c2.tar.gz bcm5719-llvm-4dc1c9735b5790bac59c13edede3e34b326ed0c2.zip | |
Statically link llvm-cfi-verify's libraries.
Summary:
llvm-cfi-verify (D38379) introduced a potential build failure when compiling with `-DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON`. Specific versions of cmake seem to treat the `add_subdirectory()` rule differently. It seems as if old versions of cmake BFS these rules, adding them to the fringe for expansion later. Newer versions of cmake seem to immediately execute CMakeFiles that are present in this subdirectory.
If the subdirectory is expanded through the fringe, the globbing resultant from `llvm_add_implicit_projects()` from `cmake/modules/AddLLVM.cmake:1012` means that `tools/llvm-shlib/CMakeFile.txt` gets executed before `tools/llvm-cfi-verify/lib/CMakeFile.txt`. As the latter CMakeFile adds a new library, this expansion order means that the library files required the unit tests in `unittests/tools/llvm-cfi-verify/` are not present in the dynamic library. This causes unit tests to fail as the required functions can't be found.
This change now ensures that the libraries created by `llvm-cfi-verify` are statically linked into the unit tests. As `tools/llvm-cfi-verify/lib` no longer adds anything to `llvm-shlib`, there should be no concern about the order-of-compilation.
Reviewers: skatkov, pcc
Reviewed By: skatkov, pcc
Subscribers: llvm-commits, kcc, pcc, aheejin, vlad.tsyrklevich, mgorny
Differential Revision: https://reviews.llvm.org/D39020
llvm-svn: 316059
Diffstat (limited to 'llvm/unittests/tools/llvm-cfi-verify')
| -rw-r--r-- | llvm/unittests/tools/llvm-cfi-verify/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/unittests/tools/llvm-cfi-verify/CMakeLists.txt b/llvm/unittests/tools/llvm-cfi-verify/CMakeLists.txt index 0f389592bdd..f370400c630 100644 --- a/llvm/unittests/tools/llvm-cfi-verify/CMakeLists.txt +++ b/llvm/unittests/tools/llvm-cfi-verify/CMakeLists.txt @@ -4,7 +4,6 @@ set(LLVM_LINK_COMPONENTS AllTargetsDescs AllTargetsDisassemblers AllTargetsInfos - CFIVerify MC MCParser Object @@ -15,4 +14,5 @@ list(FIND LLVM_TARGETS_TO_BUILD "X86" x86_idx) if (NOT x86_idx LESS 0) add_llvm_unittest(CFIVerifyTests FileAnalysis.cpp) + target_link_libraries(CFIVerifyTests LLVMCFIVerify) endif() |
