12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879 |
- From 548cd5eb4f45de4ec71b3421a98c9462aed75c91 Mon Sep 17 00:00:00 2001
- From: Eric Fiselier <eric@efcs.ca>
- Date: Fri, 10 Feb 2017 01:59:20 +0000
- Subject: [PATCH] [CMake] Fix pthread handling for out-of-tree builds
- LLVM defines `PTHREAD_LIB` which is used by AddLLVM.cmake and various projects
- to correctly link the threading library when needed. Unfortunately
- `PTHREAD_LIB` is defined by LLVM's `config-ix.cmake` file which isn't installed
- and therefore can't be used when configuring out-of-tree builds. This causes
- such builds to fail since `pthread` isn't being correctly linked.
- This patch attempts to fix that problem by renaming and exporting
- `LLVM_PTHREAD_LIB` as part of`LLVMConfig.cmake`. I renamed `PTHREAD_LIB`
- because It seemed likely to cause collisions with downstream users of
- `LLVMConfig.cmake`.
- git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@294690 91177308-0d34-0410-b5e6-96231b3b80d8
- ---
- COFF/CMakeLists.txt | 2 +-
- ELF/CMakeLists.txt | 2 +-
- lib/ReaderWriter/MachO/CMakeLists.txt | 2 +-
- unittests/CoreTests/CMakeLists.txt | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
- diff --git a/COFF/CMakeLists.txt b/COFF/CMakeLists.txt
- index 0eebe9348..8f24e36c0 100644
- --- a/COFF/CMakeLists.txt
- +++ b/COFF/CMakeLists.txt
- @@ -43,7 +43,7 @@ add_lld_library(lldCOFF
-
- LINK_LIBS
- lldCore
- - ${PTHREAD_LIB}
- + ${LLVM_PTHREAD_LIB}
-
- DEPENDS
- COFFOptionsTableGen
- diff --git a/ELF/CMakeLists.txt b/ELF/CMakeLists.txt
- index 5652b9351..0d1e5b214 100644
- --- a/ELF/CMakeLists.txt
- +++ b/ELF/CMakeLists.txt
- @@ -54,7 +54,7 @@ add_lld_library(lldELF
- LINK_LIBS
- lldConfig
- lldCore
- - ${PTHREAD_LIB}
- + ${LLVM_PTHREAD_LIB}
-
- DEPENDS
- ELFOptionsTableGen
- diff --git a/lib/ReaderWriter/MachO/CMakeLists.txt b/lib/ReaderWriter/MachO/CMakeLists.txt
- index 3b0698525..5a96d87f1 100644
- --- a/lib/ReaderWriter/MachO/CMakeLists.txt
- +++ b/lib/ReaderWriter/MachO/CMakeLists.txt
- @@ -28,7 +28,7 @@ add_lld_library(lldMachO
- LINK_LIBS
- lldCore
- lldYAML
- - ${PTHREAD_LIB}
- + ${LLVM_PTHREAD_LIB}
- )
-
- include_directories(.)
- diff --git a/unittests/CoreTests/CMakeLists.txt b/unittests/CoreTests/CMakeLists.txt
- index 98405d5c7..72e7c443f 100644
- --- a/unittests/CoreTests/CMakeLists.txt
- +++ b/unittests/CoreTests/CMakeLists.txt
- @@ -3,5 +3,5 @@ add_lld_unittest(CoreTests
- )
-
- target_link_libraries(CoreTests
- - ${PTHREAD_LIB}
- + ${LLVM_PTHREAD_LIB}
- )
- --
- 2.12.2
|