Author: tstellar Date: Thu May 18 20:56:29 2017 New Revision: 303401 URL: http://llvm.org/viewvc/llvm-project?rev=303401&view=rev Log: Merging r294690:
------------------------------------------------------------------------ r294690 | ericwf | 2017-02-09 20:59:20 -0500 (Thu, 09 Feb 2017) | 13 lines [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`. ------------------------------------------------------------------------ Modified: clang-tools-extra/branches/release_40/include-fixer/plugin/CMakeLists.txt Modified: clang-tools-extra/branches/release_40/include-fixer/plugin/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/branches/release_40/include-fixer/plugin/CMakeLists.txt?rev=303401&r1=303400&r2=303401&view=diff ============================================================================== --- clang-tools-extra/branches/release_40/include-fixer/plugin/CMakeLists.txt (original) +++ clang-tools-extra/branches/release_40/include-fixer/plugin/CMakeLists.txt Thu May 18 20:56:29 2017 @@ -9,5 +9,5 @@ add_clang_library(clangIncludeFixerPlugi clangParse clangSema clangTooling - ${PTHREAD_LIB} + ${LLVM_PTHREAD_LIB} ) _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits