diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:37:59 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:37:59 -0500 |
| commit | 69b6aa5db2034e8e34bd234a4ebf04763419933a (patch) | |
| tree | 5dd27272bed719fafb4bbb67a184cf57f0106406 /indra/cmake/LLCommon.cmake | |
| parent | 1a9b0523de81c9844aeaa13a3191d9881918bfa8 (diff) | |
| parent | 12bc7eb0179d3154f929252c7ff95a4e8e244c0d (diff) | |
merge changes for storm-669
Diffstat (limited to 'indra/cmake/LLCommon.cmake')
| -rw-r--r-- | indra/cmake/LLCommon.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake index d1ab264a41..17e211cb99 100644 --- a/indra/cmake/LLCommon.cmake +++ b/indra/cmake/LLCommon.cmake @@ -13,7 +13,14 @@ set(LLCOMMON_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ) -set(LLCOMMON_LIBRARIES llcommon) +if (LINUX) + # In order to support using ld.gold on linux, we need to explicitely + # specify all libraries that llcommon uses. + # llcommon uses `clock_gettime' which is provided by librt on linux. + set(LLCOMMON_LIBRARIES llcommon rt) +else (LINUX) + set(LLCOMMON_LIBRARIES llcommon) +endif (LINUX) add_definitions(${TCMALLOC_FLAG}) |